CE upstream - 2018-05-25 21:23 UTC
Files to resolve:
-
@ClemMakesApps Please resolve (UU) app/assets/javascripts/boards/components/modal/empty_state.js
-
@ClemMakesApps Please resolve (UU) app/assets/javascripts/ide/components/new_dropdown/modal.vue
-
@ClemMakesApps Please resolve (UU) app/assets/javascripts/jobs/components/sidebar_details_block.vue
-
@ClemMakesApps Please resolve (UU) app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue
-
@ClemMakesApps Please resolve (UU) app/assets/stylesheets/framework/dropdowns.scss
-
@ClemMakesApps Please resolve (UU) app/assets/stylesheets/framework/panels.scss
-
@ClemMakesApps Please resolve (UU) app/assets/stylesheets/pages/builds.scss
-
@ClemMakesApps Please resolve (UU) app/assets/stylesheets/pages/cycle_analytics.scss
-
@ClemMakesApps Please resolve (UU) app/assets/stylesheets/pages/editor.scss
-
@ClemMakesApps Please resolve (UU) app/assets/stylesheets/pages/groups.scss
-
@ClemMakesApps Please resolve (UU) app/assets/stylesheets/pages/issues.scss
-
@ClemMakesApps Please resolve (UU) app/assets/stylesheets/pages/members.scss
-
@ClemMakesApps Please resolve (UU) app/assets/stylesheets/pages/merge_requests.scss
-
@ClemMakesApps Please resolve (UU) app/assets/stylesheets/pages/milestone.scss
-
@ClemMakesApps Please resolve (UU) app/assets/stylesheets/pages/settings.scss
-
@ClemMakesApps Please resolve (UU) app/views/abuse_reports/new.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/abuse_reports/_abuse_report.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/appearances/_form.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/application_settings/_account_and_limit.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/application_settings/_ci_cd.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/application_settings/_help_page.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/application_settings/_signin.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/application_settings/_visibility_and_access.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/broadcast_messages/_form.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/conversational_development_index/show.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/groups/_form.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/groups/show.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/identities/_form.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/labels/_form.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/projects/show.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/requests_profiles/index.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/users/_form.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/admin/users/_user.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/devise/shared/_tabs_ldap.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/groups/_group_admin_settings.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/groups/edit.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/groups/group_members/_new_group_member.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/groups/milestones/_form.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/import/_githubish_status.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/import/bitbucket/status.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/import/fogbugz/new.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/import/gitea/new.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/layouts/devise.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/layouts/header/_default.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/layouts/nav/_dashboard.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/layouts/nav/sidebar/_admin.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/layouts/terms.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/profiles/keys/_key_details.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/profiles/passwords/new.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/blob/_new_dir.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/branches/new.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/clusters/gcp/_show.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/commit/_change.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/commits/_commit.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/jobs/_sidebar.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/merge_requests/creations/_new_compare.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/new.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/pages/_destroy.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/pages_domains/_form.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/pipeline_schedules/_form.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/pipelines/_with_tabs.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/project_members/import.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/project_members/index.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/services/prometheus/_show.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/settings/ci_cd/_form.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/wikis/_form.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/wikis/_sidebar.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/wikis/git_access.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/_clone_panel.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/_commit_message_container.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/_issues.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/_label.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/_label_row.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/_merge_requests.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/_new_commit_form.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/_service_settings.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/boards/_show.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/boards/components/_board.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/deploy_keys/_form.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/issuable/_sidebar.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/issuable/form/_merge_params.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/issuable/form/_title.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/members/_member.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/members/_requests.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/milestones/_issuables.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/milestones/_sidebar.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/runners/_form.html.haml
-
@ClemMakesApps Please resolve (UU) yarn.lock
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-05-25
branch.
Thanks in advance!
@ClemMakesApps After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.
Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!