CE upstream - Wednesday
Files to resolve:
-
@stanhu
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/17b7952ea240e4a2bf8cec2e98b4c9e3c2563a57/Gemfile.lock (UU) -
@smcgivern
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/17b7952ea240e4a2bf8cec2e98b4c9e3c2563a57/app/controllers/projects/issues_controller.rb (UU) -
Maxim Rydkin Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/17b7952ea240e4a2bf8cec2e98b4c9e3c2563a57/app/models/ci/runner.rb (UU) -
Travis Miller Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/17b7952ea240e4a2bf8cec2e98b4c9e3c2563a57/app/views/admin/dashboard/index.html.haml (UU) -
@brycepj
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/17b7952ea240e4a2bf8cec2e98b4c9e3c2563a57/app/views/layouts/nav/sidebar/_admin.html.haml (UU) -
@marcia
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/17b7952ea240e4a2bf8cec2e98b4c9e3c2563a57/doc/README.md (UU) -
@rymai
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/17b7952ea240e4a2bf8cec2e98b4c9e3c2563a57/lib/ci/model.rb (UD) -
@grzesiek
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/17b7952ea240e4a2bf8cec2e98b4c9e3c2563a57/lib/gitlab/workhorse.rb (UU) -
@grzesiek
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/17b7952ea240e4a2bf8cec2e98b4c9e3c2563a57/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb (UD)
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-09-13
branch.
Thanks in advance!
Note: This merge request was created by an experimental script, it's not perfect (yet)!
Edited by Rémy Coutable