CE upstream - Wednesday
Files to resolve:
-
@jhurewitz
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/07ce00df3275b5c130b2e1fc2475a7f98fd2ac57/LICENSE (UU) -
@andrewn
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/07ce00df3275b5c130b2e1fc2475a7f98fd2ac57/app/controllers/projects/refs_controller.rb (UU) -
@madlittlemods
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/07ce00df3275b5c130b2e1fc2475a7f98fd2ac57/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js (UU) -
@grzesiek
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/07ce00df3275b5c130b2e1fc2475a7f98fd2ac57/spec/lib/gitlab/ci/yaml_processor_spec.rb (UU) -
@felipe_artur
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/07ce00df3275b5c130b2e1fc2475a7f98fd2ac57/spec/policies/project_policy_spec.rb (UU) -
@rymai
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/07ce00df3275b5c130b2e1fc2475a7f98fd2ac57/spec/requests/api/boards_spec.rb (UU) -
@rymai
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/07ce00df3275b5c130b2e1fc2475a7f98fd2ac57/spec/requests/api/v3/builds_spec.rb (UU)
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-09-20
branch.
Thanks in advance!
Note: This merge request was created by an experimental script, it's not perfect (yet)!
Edited by username-removed-128633