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)!

marked the checklist item @jhurewitz Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/07ce00df3275b5c130b2e1fc2475a7f98fd2ac57/LICENSE (UU) as completed

marked the checklist item @andrewn Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/07ce00df3275b5c130b2e1fc2475a7f98fd2ac57/app/controllers/projects/refs_controller.rb (UU) as completed

marked the checklist item @madlittlemods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/07ce00df3275b5c130b2e1fc2475a7f98fd2ac57/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js (UU) as completed

marked the checklist item @grzesiek Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/07ce00df3275b5c130b2e1fc2475a7f98fd2ac57/spec/lib/gitlab/ci/yaml_processor_spec.rb (UU) as completed

marked the checklist item @felipe_artur Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/07ce00df3275b5c130b2e1fc2475a7f98fd2ac57/spec/policies/project_policy_spec.rb (UU) as completed

marked the checklist item @rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/07ce00df3275b5c130b2e1fc2475a7f98fd2ac57/spec/requests/api/boards_spec.rb (UU) as completed

marked the checklist item @rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/07ce00df3275b5c130b2e1fc2475a7f98fd2ac57/spec/requests/api/v3/builds_spec.rb (UU) as completed

added 6 commits

• 27c9c5e9 - Resolve conflict in LICENSE
• 3b572f2e - Resolve conflict in app/controllers/projects/refs_controller.rb
• ea8b320a - Resolve conflict in spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
• 1949b4cb - Resolve conflict in spec/lib/gitlab/ci/yaml_processor_spec.rb
• 06d8df22 - Resolve conflict in spec/policies/project_policy_spec.rb
• 1da1fed1 - Resolve conflict in spec/requests/api/v3/builds_spec.rb

Compare with previous version

@jhurewitz Please double-check https://gitlab.com/gitlab-org/gitlab-ee/commit/27c9c5e9f249b35b408d72333744cb0ab3847a7d?w=1, thanks!

Note to self: backport 135dd512 to CE.

added 2 commits

• 8e007e88 - Fix db/schema.rb
• a1852e06 - Print the diff in scripts/schema_changed.sh

Compare with previous version

Note to self: backport https://gitlab.com/gitlab-org/gitlab-ee/commit/1da1fed1076f20b9363eb09b6e506c4353fb1eb0#a44d8ca445e512b0b6b0220f88d43be0304ba012 to CE.

added 1 commit

• 135dd512 - Print the diff in scripts/schema_changed.sh

Compare with previous version

@rymai LGTM

added 2 commits

• ba056f9b - Fix db/schema.rb
• 2f023955 - Revert "Fix db/schema.rb"

Compare with previous version

approved this merge request

merged

mentioned in commit 7c627ac8