CE upstream - Friday
Files to resolve:
-
@MadLittleMods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/app/assets/javascripts/boards/boards_bundle.js (UU) -
@MadLittleMods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/app/assets/javascripts/boards/filtered_search_boards.js (UU) -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/app/assets/javascripts/dispatcher.js (UU) -
@filipa Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/app/assets/javascripts/environments/stores/environments_store.js (UU) -
@lbennett Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/app/assets/javascripts/vue_merge_request_widget/dependencies.js (UU) -
@ClemMakesApps Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/app/controllers/autocomplete_controller.rb (UU) -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/app/models/project.rb (UU) -
@DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/app/models/user.rb (UU) -
@DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/app/services/ci/create_pipeline_service.rb (UU) -
@ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/app/services/git_push_service.rb (UU) -
@ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/app/services/git_tag_push_service.rb (UU) -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/app/views/projects/jobs/_sidebar.html.haml (UU) -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/app/views/projects/jobs/show.html.haml (UU) -
Riccardo Padovani Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/db/schema.rb (UU) -
Riccardo Padovani Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/doc/api/projects.md (UU) -
@dzaporozhets Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/lib/gitlab/etag_caching/router.rb (UU) -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/lib/gitlab/utils.rb (UU) -
@ClemMakesApps Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/spec/controllers/autocomplete_controller_spec.rb (UU) -
@DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/spec/features/issues/form_spec.rb (UU) -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/spec/features/projects/jobs_spec.rb (UU) -
@filipa Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/spec/javascripts/environments/environments_store_spec.js (UU) -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/spec/lib/gitlab/utils_spec.rb (UU) -
@ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/spec/services/git_push_service_spec.rb (UU) -
@iamphill Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/06611ac91e0345e15d4022953b0d08b7463c8db8/spec/support/test_env.rb (UU)
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-06-02
branch.
Thanks in advance!
Note: This merge request was created by an experimental script, it's not perfect (yet)!
Edited by username-removed-128633