CE upstream - Wednesday
Files to resolve:
-
winniehell Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/.haml-lint.yml (UU) -
@rymai
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/Gemfile (UU) -
@rspeicher
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/Gemfile.lock (UU) -
@lbennett
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/api.js (UU) -
@iamphill
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/dispatcher.js (UU) -
@annabeldunstone
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/new_sidebar.js (UU) -
@brycepj
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/project_select.js (UU) -
@psimyn
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js (UU) -
@psimyn
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js (UU) -
@psimyn
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.js (UU) -
@psimyn
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js (UU) -
@psimyn
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js (UU) -
@psimyn
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js (UU) -
@psimyn
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js (UU) -
@psimyn
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js (UU) -
@oswaldo
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js (UU) -
@psimyn
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/stylesheets/framework/variables.scss (UU) -
@annabeldunstone
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/stylesheets/new_sidebar.scss (UU) -
@psimyn
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/assets/stylesheets/pages/merge_requests.scss (UU) -
@smcgivern
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/controllers/admin/health_check_controller.rb (UU) -
@jameslopez
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/controllers/omniauth_callbacks_controller.rb (UU) -
@jschatz1
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/helpers/dropdowns_helper.rb (UU) -
@briann
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/models/merge_request.rb (UU) -
@nick.thomas
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/models/project_import_data.rb (UU) -
@briann
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/models/repository.rb (UU) -
@annabeldunstone
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/views/layouts/nav/_new_group_sidebar.html.haml (UU) -
@mikegreiling
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/views/projects/jobs/_sidebar.html.haml (UU) -
@DouweM
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/views/projects/tree/_tree_content.html.haml (UU) -
@DouweM
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/views/projects/tree/_tree_header.html.haml (UU) -
@filipa
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/views/shared/_import_form.html.haml (UU) -
@annabeldunstone
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/views/shared/_sidebar_toggle_button.html.haml (AA) -
@selfup
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/app/views/shared/issuable/_sidebar.html.haml (UU) -
kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/config/webpack.config.js (UU) -
@rdavila
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/db/schema.rb (UU) -
@rdavila
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/lib/api/entities.rb (UU) -
@smcgivern
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/lib/gitlab/usage_data.rb (UU) -
@psimyn
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/features/merge_requests/closes_issues_spec.rb (UU) -
@oswaldo
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/fixtures/api/schemas/entities/merge_request.json (UU) -
@smcgivern
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/initializers/6_validations_spec.rb (UU) -
@psimyn
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/javascripts/vue_mr_widget/components/mr_widget_related_links_spec.js (UU) -
@nick.thomas
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/lib/gitlab/shell_spec.rb (UU) -
@oswaldo
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/serializers/merge_request_entity_spec.rb (UU) -
@nick.thomas
Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/56db0489525f438e2bef60e588e964ffd008a0c3/spec/services/wiki_pages/update_service_spec.rb (UU)
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-08-09
branch.
Thanks in advance!
Note: This merge request was created by an experimental script, it's not perfect (yet)!
Edited by Nick Thomas