CE Upstream - Tuesday
Conflicts:
-
@rymai please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/.gitlab-ci.yml -
@timothyandrew please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/CHANGELOG.md -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/javascripts/blob/viewer/index.js -
@lbennett please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/javascripts/dispatcher.js -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/javascripts/line_highlighter.js -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/controllers/concerns/renders_blob.rb -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/controllers/projects/blob_controller.rb -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/helpers/blob_helper.rb -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/models/blob.rb -
https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/models/merge_request.rb -
https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/services/slash_commands/interpret_service.rb -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/projects/blob/_header.html.haml -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/projects/blob/viewers/_markup.html.haml -
@lbennett please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/shared/milestones/_sidebar.html.haml -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/shared/snippets/_blob.html.haml -
https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/shared/web_hooks/_form.html.haml -
https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/user/project/slash_commands.md -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/features/projects/blobs/blob_show_spec.rb -
@lbennett please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/features/projects/milestones/milestone_spec.rb -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/helpers/blob_helper_spec.rb -
@zj please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/models/project_spec.rb -
@bkc please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/models/repository_spec.rb -
@samrose3 please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/support/test_env.rb -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/views/projects/blob/_viewer.html.haml_spec.rb
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee
branch.
People mentioned here are picked by git log -1 -- FILENAME
. If you are wrong person to resolve the conflict - please ping me so I can manually pick a right person.
Thanks for help!