CE upstream - Wednesday
Files to resolve:
-
@axil Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/.gitlab-ci.yml -
@ClemMakesApps Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/CHANGELOG.md -
@MadLittleMods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/assets/javascripts/dispatcher.js -
@filipa Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/assets/javascripts/environments/components/environments_table.vue -
@mikegreiling Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/assets/javascripts/gl_dropdown.js -
@MadLittleMods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/assets/javascripts/issuable_form.js -
Sam Rose Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/assets/javascripts/milestone_select.js -
@ClemMakesApps Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/assets/javascripts/users_select.js -
@lbennett Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js -
@rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/assets/javascripts/vue_merge_request_widget/dependencies.js -
@filipa Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/assets/javascripts/vue_shared/components/ci_badge_link.vue -
@iamphill Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/assets/stylesheets/pages/issuable.scss -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/assets/stylesheets/pages/merge_requests.scss -
@lbennett Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/controllers/projects/issues_controller.rb -
@DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/helpers/diff_helper.rb -
David Turner Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/helpers/submodule_helper.rb -
@DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/models/blob.rb -
blackst0ne Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/models/group.rb -
@vsizov Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/models/issue_assignee.rb -
@rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/models/project.rb -
@vsizov Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/models/user.rb -
@vsizov Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/services/issuable_base_service.rb -
@jivanvl Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/views/admin/health_check/show.html.haml -
@DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/views/projects/branches/new.html.haml -
@kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/views/projects/edit.html.haml -
@mikegreiling Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/views/projects/issues/index.html.haml -
@lbennett Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/views/projects/issues/show.html.haml -
@brodock Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/app/workers/post_receive.rb -
@rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/config/webpack.config.js -
@rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/db/schema.rb -
@vsizov Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/doc/api/issues.md -
Sota Yamashita Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/doc/development/architecture.md -
@rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/doc/topics/authentication/index.md -
@JobV Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/doc/user/admin_area/settings/usage_statistics.md -
@DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/features/project/project.feature -
@DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/features/steps/project/project.rb -
@reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/lib/api/entities.rb -
@rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/lib/api/services.rb -
George Andrinopoulos Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/lib/api/users.rb -
@reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/lib/gitlab/database/migration_helpers.rb -
@jacobvosmaer-gitlab Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/lib/gitlab/gitaly_client/commit.rb -
@mkozono Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/controllers/groups_controller_spec.rb -
@vsizov Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/features/auto_deploy_spec.rb -
@annabeldunstone Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/features/dashboard/group_spec.rb -
@lbennett Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/features/issues/form_spec.rb -
@filipa Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/javascripts/gl_dropdown_spec.js -
@lbennett Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/javascripts/issue_show/issue_title_description_spec.js -
@vsizov Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/lib/gitlab/file_finder_spec.rb -
@vsizov Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/lib/gitlab/project_search_results_spec.rb -
@jacobvosmaer-gitlab Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/lib/gitlab/workhorse_spec.rb -
@smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/models/application_setting_spec.rb -
blackst0ne Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/models/group_spec.rb -
@rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/models/project_spec.rb -
Douglas Barbosa Alexandre Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/models/user_spec.rb -
@DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/policies/project_snippet_policy_spec.rb -
@vsizov Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/requests/api/issues_spec.rb -
@rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/support/kubernetes_helpers.rb -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/e5c2aef5005d58eb2e90f6367703e1ad2ed9355c/spec/workers/post_receive_spec.rb
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-05-17
branch.
Thanks in advance!
Note: This merge request was created by an experimental script, it's not perfect (yet)!
Edited by Rémy Coutable