CE upstream - Wednesday
Files to resolve:
-
@oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/Gemfile (UU) -
@oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/Gemfile.lock (UU) -
@filipa Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/app/assets/stylesheets/pages/pipelines.scss (UU) -
@smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/app/helpers/system_note_helper.rb (UU) -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/app/services/ci/create_pipeline_service.rb (UU) -
@smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/app/services/system_note_service.rb (UU) -
@oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/doc/api/issues.md (UU) -
@marcia Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/doc/articles/index.md (UU) -
@marcia Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/doc/integration/README.md (UU) -
@smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/doc/user/project/quick_actions.md (UU) -
@oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/lib/api/helpers/related_resources_helpers.rb (AA) -
@dzaporozhets Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/lib/api/triggers.rb (UU) -
@oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/lib/api/v3/entities.rb (UU) -
@tiagonbotelho Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/spec/controllers/admin/dashboard_controller_spec.rb (AA) -
@smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/spec/features/issues/user_uses_slash_commands_spec.rb (UU) -
@ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/spec/requests/api/triggers_spec.rb (UU) -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/spec/serializers/pipeline_serializer_spec.rb (UU) -
@smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/spec/services/quick_actions/interpret_service_spec.rb (UU) -
@felipe_artur Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/spec/support/api/milestones_shared_examples.rb (UU) -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/c285f3501d14057f34591ba51a92abbb09e69a25/spec/support/stub_configuration.rb (UU)
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-07-26
branch.
Thanks in advance!
Note: This merge request was created by an experimental script, it's not perfect (yet)!
Edited by username-removed-423915