CE upstream - Wednesday
Files to resolve:
-
@mikegreiling Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/assets/javascripts/merge_request_widget.js -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/assets/javascripts/notes.js -
kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/assets/javascripts/pipelines/components/stage.js -
kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/assets/javascripts/pipelines/components/stage.vue -
@mikegreiling Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/assets/javascripts/project_new.js -
kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js -
kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/assets/javascripts/vue_merge_request_widget/dependencies.js -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js -
kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/assets/javascripts/vue_shared/components/memory_graph.js -
@sam Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/assets/stylesheets/framework/lists.scss -
kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/assets/stylesheets/framework/memory_graph.scss -
kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/assets/stylesheets/pages/merge_requests.scss -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/controllers/projects/branches_controller.rb -
kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/controllers/projects/merge_requests_controller.rb -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/helpers/merge_requests_helper.rb -
Zeger-Jan van de Weg Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/models/project.rb -
@to1ne Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/models/user.rb -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/presenters/merge_request_presenter.rb -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/serializers/environment_entity.rb -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/serializers/merge_request_basic_entity.rb -
@vsizov Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/serializers/merge_request_entity.rb -
@felipe_artur Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/services/ci/create_pipeline_service.rb -
@DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/views/projects/blob/_header.html.haml -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/views/projects/merge_requests/_show.html.haml -
@DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/views/projects/tree/_tree_content.html.haml -
@ClemMakesApps Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/views/shared/issuable/_sidebar.html.haml -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/views/shared/issuable/form/_merge_params.html.haml -
@ClemMakesApps Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/app/views/shared/issuable/form/_metadata.html.haml -
@iamphill Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/config/webpack.config.js -
@felipe_artur Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/db/schema.rb -
@marcia Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/doc/intro/README.md -
@marcia Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/doc/user/project/issues/index.md -
@marcia Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/doc/user/project/issues/issues_functionalities.md -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/features/steps/project/forked_merge_requests.rb -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/features/steps/project/merge_requests.rb -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/features/support/env.rb -
@sam Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/lib/gitlab/checks/change_access.rb -
@mkozono Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/spec/controllers/groups_controller_spec.rb -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/spec/controllers/projects/merge_requests_controller_spec.rb -
@mkozono Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/spec/controllers/projects_controller_spec.rb -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/spec/features/merge_requests/closes_issues_spec.rb -
Zeger-Jan van de Weg Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/spec/features/security/project/private_access_spec.rb -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/spec/fixtures/api/schemas/entities/merge_request.json -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/spec/fixtures/api/schemas/entities/merge_request_basic.json -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/spec/helpers/merge_requests_helper_spec.rb -
kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/spec/javascripts/vue_mr_widget/components/mr_widget_deployment_spec.js -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/spec/presenters/merge_request_presenter_spec.rb -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/spec/serializers/merge_request_entity_spec.rb -
@fatihacet Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2bcb19dd02a243346d8e65bf528d09680f4f4d70/spec/serializers/pipeline_serializer_spec.rb
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-05-10
branch.
Thanks in advance!
Note: This merge request was created by an experimental script, it's not perfect (yet)!