CE upstream - Wednesday
Files to resolve:
-
@rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ac1e1b053bc1853f4eb7f4ba6eb944fdfc1158ca/.gitlab-ci.yml -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ac1e1b053bc1853f4eb7f4ba6eb944fdfc1158ca/CHANGELOG.md -
@stanhu Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ac1e1b053bc1853f4eb7f4ba6eb944fdfc1158ca/Gemfile.lock -
@MadLittleMods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ac1e1b053bc1853f4eb7f4ba6eb944fdfc1158ca/app/views/projects/blob/_header.html.haml -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ac1e1b053bc1853f4eb7f4ba6eb944fdfc1158ca/config/database.yml.postgresql -
blackst0ne Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ac1e1b053bc1853f4eb7f4ba6eb944fdfc1158ca/db/schema.rb -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ac1e1b053bc1853f4eb7f4ba6eb944fdfc1158ca/scripts/prepare_build.sh -
@smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ac1e1b053bc1853f4eb7f4ba6eb944fdfc1158ca/spec/features/merge_requests/diffs_spec.rb -
Jacopo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ac1e1b053bc1853f4eb7f4ba6eb944fdfc1158ca/spec/features/protected_branches_spec.rb -
@MadLittleMods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ac1e1b053bc1853f4eb7f4ba6eb944fdfc1158ca/spec/javascripts/blob/blob_fork_suggestion_spec.js -
@eReGeBe Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ac1e1b053bc1853f4eb7f4ba6eb944fdfc1158ca/spec/support/test_env.rb -
@kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ac1e1b053bc1853f4eb7f4ba6eb944fdfc1158ca/yarn.lock
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-04-26
branch.
Thanks in advance!
Note: This merge request was created by an experimental script, it's not perfect (yet)!