From a27b8a5c104f492e4b0abac4c84385a615c4f6ba Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 1 Oct 2020 12:10:14 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .haml-lint_todo.yml | 732 +++++++++--------- .../commit/pipelines/pipelines_table.vue | 124 +-- .../components/compare_dropdown_layout.vue | 2 +- .../diffs/components/compare_versions.vue | 1 + .../diffs/components/diff_file_header.vue | 9 +- app/assets/javascripts/main.js | 10 +- app/assets/javascripts/merge_request.js | 74 +- .../pipelines_list/pipelines_table.vue | 4 + .../projects/default_project_templates.js | 4 + .../reviewers/collapsed_reviewer.vue | 24 + .../reviewers/collapsed_reviewer_list.vue | 107 +++ .../components/reviewers/reviewer_avatar.vue | 43 + .../reviewers/reviewer_avatar_link.vue | 84 ++ .../components/reviewers/reviewer_title.vue | 64 ++ .../components/reviewers/reviewers.vue | 72 ++ .../reviewers/sidebar_reviewers.vue | 107 +++ .../reviewers/uncollapsed_reviewer_list.vue | 103 +++ .../javascripts/sidebar/mount_sidebar.js | 32 + app/assets/javascripts/tooltips/index.js | 2 + .../components/states/work_in_progress.vue | 4 +- .../dropdown_contents_labels_view.vue | 7 +- app/assets/stylesheets/framework/buttons.scss | 6 - .../stylesheets/framework/variables.scss | 1 - app/assets/stylesheets/pages/issuable.scss | 3 +- app/assets/stylesheets/pages/pipelines.scss | 4 - .../concerns/multiple_boards_actions.rb | 6 +- .../merge_requests/application_controller.rb | 1 + app/helpers/issuables_helper.rb | 6 + app/models/commit_status.rb | 9 +- app/models/merge_request.rb | 2 - app/presenters/merge_request_presenter.rb | 2 +- app/serializers/merge_request_basic_entity.rb | 1 + app/services/boards/create_service.rb | 18 +- .../ci/pipelines/create_artifact_service.rb | 1 - app/views/admin/groups/_form.html.haml | 2 - app/views/admin/users/_modals.html.haml | 2 +- app/views/layouts/_head.html.haml | 2 +- .../merge_requests/_mr_title.html.haml | 9 +- .../issuable/_close_reopen_button.html.haml | 7 +- ...close_reopen_draft_report_toggle.html.haml | 37 + app/views/shared/issuable/_sidebar.html.haml | 5 + ...move-coverage-report-view-feature-flag.yml | 5 + ...7-use-fuzzaldrinplus-search-for-labels.yml | 5 + ...54281-add-user-agent-to-git-lfs-client.yml | 5 + ...gured-with-gitpod-to-project-templates.yml | 5 + ...ialog-text-contains-formatting-strings.yml | 5 + ...964-update-node-sass-from-4-12-to-4-14.yml | 5 + .../add_index_for_sha_to_deployments.yml | 5 + ...-changeMROptionsDropdownToIncludeDraft.yml | 5 + changelogs/unreleased/sh-lfs-smudge-api.yml | 5 + config/feature_categories.yml | 6 +- ...rt_view.yml => one_dimensional_matrix.yml} | 10 +- ...ex_on_project_id_and_sha_to_deployments.rb | 20 + db/schema_migrations/20200930131343 | 1 + db/structure.sql | 2 + doc/api/epics.md | 2 + doc/ci/yaml/README.md | 5 + doc/development/architecture.md | 76 +- doc/update/10.0-ce-to-ee.md | 5 - doc/update/10.0-to-10.1.md | 5 - doc/update/10.1-ce-to-ee.md | 5 - doc/update/10.1-to-10.2.md | 5 - doc/update/10.2-ce-to-ee.md | 5 - doc/update/10.2-to-10.3.md | 5 - doc/update/10.3-ce-to-ee.md | 5 - doc/update/10.3-to-10.4.md | 5 - doc/update/10.4-ce-to-ee.md | 5 - doc/update/10.4-to-10.5.md | 5 - doc/update/10.5-ce-to-ee.md | 5 - doc/update/10.5-to-10.6.md | 5 - doc/update/10.6-ce-to-ee.md | 5 - doc/update/10.6-to-10.7.md | 5 - doc/update/10.7-ce-to-ee.md | 5 - doc/update/10.7-to-10.8.md | 5 - doc/update/10.8-ce-to-ee.md | 5 - doc/update/10.8-to-11.0.md | 5 - doc/update/11.0-ce-to-ee.md | 5 - doc/update/11.0-to-11.1.md | 5 - doc/update/11.1-ce-to-ee.md | 5 - doc/update/11.1-to-11.2.md | 5 - doc/update/11.2-ce-to-ee.md | 5 - doc/update/11.2-to-11.3.md | 5 - doc/update/11.3-ce-to-ee.md | 5 - doc/update/11.3-to-11.4.md | 5 - doc/update/11.4-ce-to-ee.md | 5 - doc/update/11.4-to-11.5.md | 5 - doc/update/11.5-ce-to-ee.md | 5 - doc/update/11.5-to-11.6.md | 5 - doc/update/11.6-ce-to-ee.md | 5 - doc/update/11.6-to-11.7.md | 5 - doc/update/11.7-ce-to-ee.md | 5 - doc/update/11.7-to-11.8.md | 5 - doc/update/11.8-ce-to-ee.md | 5 - doc/update/2.6-to-3.0.md | 5 - doc/update/2.9-to-3.0.md | 5 - doc/update/3.0-to-3.1.md | 5 - doc/update/3.1-to-4.0.md | 5 - doc/update/4.0-to-4.1.md | 5 - doc/update/4.1-to-4.2.md | 5 - doc/update/4.2-to-5.0.md | 5 - doc/update/5.0-to-5.1.md | 5 - doc/update/5.1-to-5.2.md | 5 - doc/update/5.1-to-5.4.md | 5 - doc/update/5.1-to-6.0.md | 5 - doc/update/5.2-to-5.3.md | 5 - doc/update/5.3-to-5.4.md | 5 - doc/update/5.4-to-6.0.md | 5 - doc/update/6.0-ce-to-ee.md | 5 - doc/update/6.0-to-6.1.md | 5 - doc/update/6.1-ce-to-ee.md | 5 - doc/update/6.1-to-6.2.md | 5 - doc/update/6.2-ce-to-ee.md | 5 - doc/update/6.2-to-6.3.md | 5 - doc/update/6.3-ce-to-ee.md | 5 - doc/update/6.3-to-6.4.md | 5 - doc/update/6.4-ce-to-ee.md | 5 - doc/update/6.4-to-6.5.md | 5 - doc/update/6.5-ce-to-ee.md | 5 - doc/update/6.5-to-6.6.md | 5 - doc/update/6.6-ce-to-ee.md | 5 - doc/update/6.6-to-6.7.md | 5 - doc/update/6.7-ce-to-ee.md | 5 - doc/update/6.7-to-6.8.md | 5 - doc/update/6.8-ce-to-ee.md | 5 - doc/update/6.8-to-6.9.md | 5 - doc/update/6.9-ce-to-ee.md | 5 - doc/update/6.9-to-7.0.md | 5 - doc/update/6.x-or-7.x-to-7.14.md | 5 - doc/update/7.0-ce-to-ee.md | 5 - doc/update/7.0-to-7.1.md | 5 - doc/update/7.1-ce-to-ee.md | 5 - doc/update/7.1-to-7.2.md | 5 - doc/update/7.10-ce-to-ee.md | 5 - doc/update/7.10-to-7.11.md | 5 - doc/update/7.11-ce-to-ee.md | 5 - doc/update/7.11-to-7.12.md | 5 - doc/update/7.12-ce-to-ee.md | 5 - doc/update/7.12-to-7.13.md | 5 - doc/update/7.13-ce-to-ee.md | 5 - doc/update/7.13-to-7.14.md | 5 - doc/update/7.14-ce-to-ee.md | 5 - doc/update/7.14-to-8.0.md | 5 - doc/update/7.2-to-7.3.md | 5 - doc/update/7.3-ce-to-ee.md | 5 - doc/update/7.3-to-7.4.md | 5 - doc/update/7.4-ce-to-ee.md | 5 - doc/update/7.4-to-7.5.md | 5 - doc/update/7.5-ce-to-ee.md | 5 - doc/update/7.5-to-7.6.md | 5 - doc/update/7.6-ce-to-ee.md | 5 - doc/update/7.6-to-7.7.md | 5 - doc/update/7.7-ce-to-ee.md | 5 - doc/update/7.7-to-7.8.md | 5 - doc/update/7.8-ce-to-ee.md | 5 - doc/update/7.8-to-7.9.md | 5 - doc/update/7.9-ce-to-ee.md | 5 - doc/update/7.9-to-7.10.md | 5 - doc/update/8.0-ce-to-ee.md | 5 - doc/update/8.0-to-8.1.md | 5 - doc/update/8.1-ce-to-ee.md | 5 - doc/update/8.1-to-8.2.md | 5 - doc/update/8.10-ce-to-ee.md | 5 - doc/update/8.10-to-8.11.md | 5 - doc/update/8.11-ce-to-ee.md | 5 - doc/update/8.11-to-8.12.md | 5 - doc/update/8.12-ce-to-ee.md | 5 - doc/update/8.12-to-8.13.md | 5 - doc/update/8.13-ce-to-ee.md | 5 - doc/update/8.13-to-8.14.md | 5 - doc/update/8.14-ce-to-ee.md | 5 - doc/update/8.14-to-8.15.md | 5 - doc/update/8.15-ce-to-ee.md | 5 - doc/update/8.15-to-8.16.md | 5 - doc/update/8.16-ce-to-ee.md | 5 - doc/update/8.16-to-8.17.md | 5 - doc/update/8.17-ce-to-ee.md | 5 - doc/update/8.17-to-9.0.md | 5 - doc/update/8.2-ce-to-ee.md | 5 - doc/update/8.2-to-8.3.md | 5 - doc/update/8.3-ce-to-ee.md | 5 - doc/update/8.3-to-8.4.md | 5 - doc/update/8.4-ce-to-ee.md | 5 - doc/update/8.4-to-8.5.md | 5 - doc/update/8.5-ce-to-ee.md | 5 - doc/update/8.5-to-8.6.md | 5 - doc/update/8.6-ce-to-ee.md | 5 - doc/update/8.6-to-8.7.md | 5 - doc/update/8.7-ce-to-ee.md | 5 - doc/update/8.7-to-8.8.md | 5 - doc/update/8.8-ce-to-ee.md | 5 - doc/update/8.8-to-8.9.md | 5 - doc/update/8.9-ce-to-ee.md | 5 - doc/update/8.9-to-8.10.md | 5 - doc/update/9.0-ce-to-ee.md | 5 - doc/update/9.0-to-9.1.md | 5 - doc/update/9.1-ce-to-ee.md | 5 - doc/update/9.1-to-9.2.md | 5 - doc/update/9.2-ce-to-ee.md | 5 - doc/update/9.2-to-9.3.md | 5 - doc/update/9.3-ce-to-ee.md | 5 - doc/update/9.3-to-9.4.md | 5 - doc/update/9.4-ce-to-ee.md | 5 - doc/update/9.4-to-9.5.md | 5 - doc/update/9.5-ce-to-ee.md | 5 - doc/update/9.5-to-10.0.md | 5 - doc/user/project/issues/managing_issues.md | 1 + .../test_coverage_visualization.md | 29 +- doc/user/search/advanced_global_search.md | 4 +- doc/user/search/advanced_search_syntax.md | 4 +- doc/user/search/img/basic_search.png | Bin 0 -> 88486 bytes doc/user/search/img/basic_search_results.png | Bin 0 -> 19901 bytes doc/user/search/index.md | 79 +- lib/api/api.rb | 1 + lib/api/internal/lfs.rb | 54 ++ .../ci/config/entry/product/variables.rb | 6 +- lib/gitlab/ci/features.rb | 8 +- lib/gitlab/lfs/client.rb | 7 +- lib/gitlab/project_template.rb | 1 + locale/gitlab.pot | 25 +- package.json | 4 +- qa/qa/page/merge_request/show.rb | 60 +- .../view_merge_request_merge_ref_diff_spec.rb | 80 ++ spec/controllers/invites_controller_spec.rb | 12 +- .../serverless/functions_controller_spec.rb | 16 +- .../close_reopen_report_toggle_spec.rb | 12 +- .../merge_request/user_edits_mr_spec.rb | 18 - .../user_marks_merge_request_as_draft_spec.rb | 29 + .../user_reopens_merge_request_spec.rb | 6 +- .../user_resolves_wip_mr_spec.rb | 4 +- .../merge_request/user_sees_pipelines_spec.rb | 4 +- .../user_views_open_merge_request_spec.rb | 17 + .../schemas/entities/merge_request_basic.json | 1 + .../commit/pipelines/pipelines_spec.js | 82 +- spec/frontend/fixtures/releases.rb | 19 +- spec/frontend/merge_request_spec.js | 63 -- .../releases/__snapshots__/util_spec.js.snap | 110 +-- spec/frontend/releases/mock_data.js | 136 ---- .../stores/modules/list/actions_spec.js | 9 +- .../stores/modules/list/mutations_spec.js | 6 +- spec/frontend/releases/util_spec.js | 6 +- spec/frontend/sidebar/reviewer_title_spec.js | 116 +++ spec/frontend/sidebar/reviewers_spec.js | 169 ++++ spec/frontend/sidebar/sidebar_labels_spec.js | 2 +- .../states/mr_widget_ready_to_merge_spec.js | 13 - .../dropdown_contents_labels_view_spec.js | 10 + .../sidebar/labels_select_vue/mock_data.js | 7 + .../ci/config/entry/product/matrix_spec.rb | 155 +++- .../ci/config/entry/product/variables_spec.rb | 99 ++- .../merge_request_diff_batch_spec.rb | 2 +- spec/lib/gitlab/lfs/client_spec.rb | 10 +- spec/lib/gitlab/project_template_spec.rb | 6 +- spec/models/commit_status_spec.rb | 129 ++- spec/requests/api/internal/lfs_spec.rb | 93 +++ .../pipelines/create_artifact_service_spec.rb | 10 - .../gcp/finalize_creation_service_spec.rb | 16 +- .../configure_istio_ingress_service_spec.rb | 20 +- ...create_or_update_namespace_service_spec.rb | 8 +- .../fetch_kubernetes_token_service_spec.rb | 24 +- .../google_api/cloud_platform_helpers.rb | 2 +- spec/support/helpers/kubernetes_helpers.rb | 6 +- .../editable_merge_request_shared_examples.rb | 26 +- .../diff_file_collections_shared_examples.rb | 2 +- .../boards_create_service_shared_examples.rb | 2 +- .../gitpod_spring_petclinic.tar.gz | Bin 0 -> 402980 bytes yarn.lock | 306 ++++---- 265 files changed, 2756 insertions(+), 2025 deletions(-) create mode 100644 app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer.vue create mode 100644 app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue create mode 100644 app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar.vue create mode 100644 app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue create mode 100644 app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue create mode 100644 app/assets/javascripts/sidebar/components/reviewers/reviewers.vue create mode 100644 app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue create mode 100644 app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue create mode 100644 app/views/shared/issuable/_close_reopen_draft_report_toggle.html.haml create mode 100644 changelogs/unreleased/249811-remove-coverage-report-view-feature-flag.yml create mode 100644 changelogs/unreleased/250727-use-fuzzaldrinplus-search-for-labels.yml create mode 100644 changelogs/unreleased/254281-add-user-agent-to-git-lfs-client.yml create mode 100644 changelogs/unreleased/255347-add-a-project-configured-with-gitpod-to-project-templates.yml create mode 100644 changelogs/unreleased/255938-delete-user-dialog-text-contains-formatting-strings.yml create mode 100644 changelogs/unreleased/258964-update-node-sass-from-4-12-to-4-14.yml create mode 100644 changelogs/unreleased/add_index_for_sha_to_deployments.yml create mode 100644 changelogs/unreleased/ph-227421-changeMROptionsDropdownToIncludeDraft.yml create mode 100644 changelogs/unreleased/sh-lfs-smudge-api.yml rename config/feature_flags/development/{coverage_report_view.yml => one_dimensional_matrix.yml} (58%) create mode 100644 db/migrate/20200930131343_add_index_on_project_id_and_sha_to_deployments.rb create mode 100644 db/schema_migrations/20200930131343 delete mode 100644 doc/update/10.0-ce-to-ee.md delete mode 100644 doc/update/10.0-to-10.1.md delete mode 100644 doc/update/10.1-ce-to-ee.md delete mode 100644 doc/update/10.1-to-10.2.md delete mode 100644 doc/update/10.2-ce-to-ee.md delete mode 100644 doc/update/10.2-to-10.3.md delete mode 100644 doc/update/10.3-ce-to-ee.md delete mode 100644 doc/update/10.3-to-10.4.md delete mode 100644 doc/update/10.4-ce-to-ee.md delete mode 100644 doc/update/10.4-to-10.5.md delete mode 100644 doc/update/10.5-ce-to-ee.md delete mode 100644 doc/update/10.5-to-10.6.md delete mode 100644 doc/update/10.6-ce-to-ee.md delete mode 100644 doc/update/10.6-to-10.7.md delete mode 100644 doc/update/10.7-ce-to-ee.md delete mode 100644 doc/update/10.7-to-10.8.md delete mode 100644 doc/update/10.8-ce-to-ee.md delete mode 100644 doc/update/10.8-to-11.0.md delete mode 100644 doc/update/11.0-ce-to-ee.md delete mode 100644 doc/update/11.0-to-11.1.md delete mode 100644 doc/update/11.1-ce-to-ee.md delete mode 100644 doc/update/11.1-to-11.2.md delete mode 100644 doc/update/11.2-ce-to-ee.md delete mode 100644 doc/update/11.2-to-11.3.md delete mode 100644 doc/update/11.3-ce-to-ee.md delete mode 100644 doc/update/11.3-to-11.4.md delete mode 100644 doc/update/11.4-ce-to-ee.md delete mode 100644 doc/update/11.4-to-11.5.md delete mode 100644 doc/update/11.5-ce-to-ee.md delete mode 100644 doc/update/11.5-to-11.6.md delete mode 100644 doc/update/11.6-ce-to-ee.md delete mode 100644 doc/update/11.6-to-11.7.md delete mode 100644 doc/update/11.7-ce-to-ee.md delete mode 100644 doc/update/11.7-to-11.8.md delete mode 100644 doc/update/11.8-ce-to-ee.md delete mode 100644 doc/update/2.6-to-3.0.md delete mode 100644 doc/update/2.9-to-3.0.md delete mode 100644 doc/update/3.0-to-3.1.md delete mode 100644 doc/update/3.1-to-4.0.md delete mode 100644 doc/update/4.0-to-4.1.md delete mode 100644 doc/update/4.1-to-4.2.md delete mode 100644 doc/update/4.2-to-5.0.md delete mode 100644 doc/update/5.0-to-5.1.md delete mode 100644 doc/update/5.1-to-5.2.md delete mode 100644 doc/update/5.1-to-5.4.md delete mode 100644 doc/update/5.1-to-6.0.md delete mode 100644 doc/update/5.2-to-5.3.md delete mode 100644 doc/update/5.3-to-5.4.md delete mode 100644 doc/update/5.4-to-6.0.md delete mode 100644 doc/update/6.0-ce-to-ee.md delete mode 100644 doc/update/6.0-to-6.1.md delete mode 100644 doc/update/6.1-ce-to-ee.md delete mode 100644 doc/update/6.1-to-6.2.md delete mode 100644 doc/update/6.2-ce-to-ee.md delete mode 100644 doc/update/6.2-to-6.3.md delete mode 100644 doc/update/6.3-ce-to-ee.md delete mode 100644 doc/update/6.3-to-6.4.md delete mode 100644 doc/update/6.4-ce-to-ee.md delete mode 100644 doc/update/6.4-to-6.5.md delete mode 100644 doc/update/6.5-ce-to-ee.md delete mode 100644 doc/update/6.5-to-6.6.md delete mode 100644 doc/update/6.6-ce-to-ee.md delete mode 100644 doc/update/6.6-to-6.7.md delete mode 100644 doc/update/6.7-ce-to-ee.md delete mode 100644 doc/update/6.7-to-6.8.md delete mode 100644 doc/update/6.8-ce-to-ee.md delete mode 100644 doc/update/6.8-to-6.9.md delete mode 100644 doc/update/6.9-ce-to-ee.md delete mode 100644 doc/update/6.9-to-7.0.md delete mode 100644 doc/update/6.x-or-7.x-to-7.14.md delete mode 100644 doc/update/7.0-ce-to-ee.md delete mode 100644 doc/update/7.0-to-7.1.md delete mode 100644 doc/update/7.1-ce-to-ee.md delete mode 100644 doc/update/7.1-to-7.2.md delete mode 100644 doc/update/7.10-ce-to-ee.md delete mode 100644 doc/update/7.10-to-7.11.md delete mode 100644 doc/update/7.11-ce-to-ee.md delete mode 100644 doc/update/7.11-to-7.12.md delete mode 100644 doc/update/7.12-ce-to-ee.md delete mode 100644 doc/update/7.12-to-7.13.md delete mode 100644 doc/update/7.13-ce-to-ee.md delete mode 100644 doc/update/7.13-to-7.14.md delete mode 100644 doc/update/7.14-ce-to-ee.md delete mode 100644 doc/update/7.14-to-8.0.md delete mode 100644 doc/update/7.2-to-7.3.md delete mode 100644 doc/update/7.3-ce-to-ee.md delete mode 100644 doc/update/7.3-to-7.4.md delete mode 100644 doc/update/7.4-ce-to-ee.md delete mode 100644 doc/update/7.4-to-7.5.md delete mode 100644 doc/update/7.5-ce-to-ee.md delete mode 100644 doc/update/7.5-to-7.6.md delete mode 100644 doc/update/7.6-ce-to-ee.md delete mode 100644 doc/update/7.6-to-7.7.md delete mode 100644 doc/update/7.7-ce-to-ee.md delete mode 100644 doc/update/7.7-to-7.8.md delete mode 100644 doc/update/7.8-ce-to-ee.md delete mode 100644 doc/update/7.8-to-7.9.md delete mode 100644 doc/update/7.9-ce-to-ee.md delete mode 100644 doc/update/7.9-to-7.10.md delete mode 100644 doc/update/8.0-ce-to-ee.md delete mode 100644 doc/update/8.0-to-8.1.md delete mode 100644 doc/update/8.1-ce-to-ee.md delete mode 100644 doc/update/8.1-to-8.2.md delete mode 100644 doc/update/8.10-ce-to-ee.md delete mode 100644 doc/update/8.10-to-8.11.md delete mode 100644 doc/update/8.11-ce-to-ee.md delete mode 100644 doc/update/8.11-to-8.12.md delete mode 100644 doc/update/8.12-ce-to-ee.md delete mode 100644 doc/update/8.12-to-8.13.md delete mode 100644 doc/update/8.13-ce-to-ee.md delete mode 100644 doc/update/8.13-to-8.14.md delete mode 100644 doc/update/8.14-ce-to-ee.md delete mode 100644 doc/update/8.14-to-8.15.md delete mode 100644 doc/update/8.15-ce-to-ee.md delete mode 100644 doc/update/8.15-to-8.16.md delete mode 100644 doc/update/8.16-ce-to-ee.md delete mode 100644 doc/update/8.16-to-8.17.md delete mode 100644 doc/update/8.17-ce-to-ee.md delete mode 100644 doc/update/8.17-to-9.0.md delete mode 100644 doc/update/8.2-ce-to-ee.md delete mode 100644 doc/update/8.2-to-8.3.md delete mode 100644 doc/update/8.3-ce-to-ee.md delete mode 100644 doc/update/8.3-to-8.4.md delete mode 100644 doc/update/8.4-ce-to-ee.md delete mode 100644 doc/update/8.4-to-8.5.md delete mode 100644 doc/update/8.5-ce-to-ee.md delete mode 100644 doc/update/8.5-to-8.6.md delete mode 100644 doc/update/8.6-ce-to-ee.md delete mode 100644 doc/update/8.6-to-8.7.md delete mode 100644 doc/update/8.7-ce-to-ee.md delete mode 100644 doc/update/8.7-to-8.8.md delete mode 100644 doc/update/8.8-ce-to-ee.md delete mode 100644 doc/update/8.8-to-8.9.md delete mode 100644 doc/update/8.9-ce-to-ee.md delete mode 100644 doc/update/8.9-to-8.10.md delete mode 100644 doc/update/9.0-ce-to-ee.md delete mode 100644 doc/update/9.0-to-9.1.md delete mode 100644 doc/update/9.1-ce-to-ee.md delete mode 100644 doc/update/9.1-to-9.2.md delete mode 100644 doc/update/9.2-ce-to-ee.md delete mode 100644 doc/update/9.2-to-9.3.md delete mode 100644 doc/update/9.3-ce-to-ee.md delete mode 100644 doc/update/9.3-to-9.4.md delete mode 100644 doc/update/9.4-ce-to-ee.md delete mode 100644 doc/update/9.4-to-9.5.md delete mode 100644 doc/update/9.5-ce-to-ee.md delete mode 100644 doc/update/9.5-to-10.0.md create mode 100644 doc/user/search/img/basic_search.png create mode 100644 doc/user/search/img/basic_search_results.png create mode 100644 lib/api/internal/lfs.rb create mode 100644 qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_merge_ref_diff_spec.rb create mode 100644 spec/features/merge_request/user_marks_merge_request_as_draft_spec.rb create mode 100644 spec/frontend/sidebar/reviewer_title_spec.js create mode 100644 spec/frontend/sidebar/reviewers_spec.js create mode 100644 spec/requests/api/internal/lfs_spec.rb create mode 100644 vendor/project_templates/gitpod_spring_petclinic.tar.gz diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml index 55a8f64f5a4..57c0e014a03 100644 --- a/.haml-lint_todo.yml +++ b/.haml-lint_todo.yml @@ -7,376 +7,374 @@ # versions of Haml-Lint, may require this file to be generated again. linters: - # Offense count: 1552 NoPlainNodes: enabled: true exclude: - - "app/views/admin/abuse_reports/_abuse_report.html.haml" - - "app/views/admin/abuse_reports/index.html.haml" - - "app/views/admin/appearances/_form.html.haml" - - "app/views/admin/application_settings/_abuse.html.haml" - - "app/views/admin/application_settings/_diff_limits.html.haml" - - "app/views/admin/application_settings/_gitaly.html.haml" - - "app/views/admin/application_settings/_ip_limits.html.haml" - - "app/views/admin/application_settings/_performance.html.haml" - - "app/views/admin/application_settings/_plantuml.html.haml" - - "app/views/admin/application_settings/_prometheus.html.haml" - - "app/views/admin/application_settings/_realtime.html.haml" - - "app/views/admin/application_settings/_repository_check.html.haml" - - "app/views/admin/application_settings/_signin.html.haml" - - "app/views/admin/application_settings/_signup.html.haml" - - "app/views/admin/application_settings/_spam.html.haml" - - "app/views/admin/application_settings/_terminal.html.haml" - - "app/views/admin/application_settings/_usage.html.haml" - - "app/views/admin/application_settings/_visibility_and_access.html.haml" - - "app/views/admin/applications/_delete_form.html.haml" - - "app/views/admin/applications/_form.html.haml" - - "app/views/admin/applications/edit.html.haml" - - "app/views/admin/applications/index.html.haml" - - "app/views/admin/applications/new.html.haml" - - "app/views/admin/applications/show.html.haml" - - "app/views/admin/background_jobs/show.html.haml" - - "app/views/admin/broadcast_messages/index.html.haml" - - "app/views/admin/dashboard/index.html.haml" - - "app/views/admin/deploy_keys/new.html.haml" - - "app/views/admin/health_check/show.html.haml" - - "app/views/admin/hook_logs/_index.html.haml" - - "app/views/admin/hook_logs/show.html.haml" - - "app/views/admin/hooks/_form.html.haml" - - "app/views/admin/hooks/edit.html.haml" - - "app/views/admin/logs/show.html.haml" - - "app/views/admin/projects/_projects.html.haml" - - "app/views/admin/requests_profiles/index.html.haml" - - "app/views/admin/runners/_runner.html.haml" - - "app/views/admin/runners/index.html.haml" - - "app/views/admin/runners/show.html.haml" - - "app/views/admin/services/_form.html.haml" - - "app/views/admin/services/index.html.haml" - - "app/views/admin/spam_logs/_spam_log.html.haml" - - "app/views/admin/spam_logs/index.html.haml" - - "app/views/admin/system_info/show.html.haml" - - "app/views/admin/users/_form.html.haml" - - "app/views/admin/users/_head.html.haml" - - "app/views/admin/users/_profile.html.haml" - - "app/views/admin/users/_projects.html.haml" - - "app/views/admin/users/new.html.haml" - - "app/views/admin/users/projects.html.haml" - - "app/views/admin/users/show.html.haml" + - 'app/views/admin/abuse_reports/_abuse_report.html.haml' + - 'app/views/admin/abuse_reports/index.html.haml' + - 'app/views/admin/appearances/_form.html.haml' + - 'app/views/admin/application_settings/_abuse.html.haml' + - 'app/views/admin/application_settings/_diff_limits.html.haml' + - 'app/views/admin/application_settings/_gitaly.html.haml' + - 'app/views/admin/application_settings/_ip_limits.html.haml' + - 'app/views/admin/application_settings/_performance.html.haml' + - 'app/views/admin/application_settings/_plantuml.html.haml' + - 'app/views/admin/application_settings/_prometheus.html.haml' + - 'app/views/admin/application_settings/_realtime.html.haml' + - 'app/views/admin/application_settings/_repository_check.html.haml' + - 'app/views/admin/application_settings/_signin.html.haml' + - 'app/views/admin/application_settings/_signup.html.haml' + - 'app/views/admin/application_settings/_spam.html.haml' + - 'app/views/admin/application_settings/_terminal.html.haml' + - 'app/views/admin/application_settings/_usage.html.haml' + - 'app/views/admin/application_settings/_visibility_and_access.html.haml' + - 'app/views/admin/applications/_delete_form.html.haml' + - 'app/views/admin/applications/_form.html.haml' + - 'app/views/admin/applications/edit.html.haml' + - 'app/views/admin/applications/index.html.haml' + - 'app/views/admin/applications/new.html.haml' + - 'app/views/admin/applications/show.html.haml' + - 'app/views/admin/background_jobs/show.html.haml' + - 'app/views/admin/broadcast_messages/index.html.haml' + - 'app/views/admin/dashboard/index.html.haml' + - 'app/views/admin/deploy_keys/new.html.haml' + - 'app/views/admin/health_check/show.html.haml' + - 'app/views/admin/hook_logs/_index.html.haml' + - 'app/views/admin/hook_logs/show.html.haml' + - 'app/views/admin/hooks/_form.html.haml' + - 'app/views/admin/hooks/edit.html.haml' + - 'app/views/admin/logs/show.html.haml' + - 'app/views/admin/projects/_projects.html.haml' + - 'app/views/admin/requests_profiles/index.html.haml' + - 'app/views/admin/runners/_runner.html.haml' + - 'app/views/admin/runners/index.html.haml' + - 'app/views/admin/runners/show.html.haml' + - 'app/views/admin/services/_form.html.haml' + - 'app/views/admin/services/index.html.haml' + - 'app/views/admin/spam_logs/_spam_log.html.haml' + - 'app/views/admin/spam_logs/index.html.haml' + - 'app/views/admin/system_info/show.html.haml' + - 'app/views/admin/users/_form.html.haml' + - 'app/views/admin/users/_head.html.haml' + - 'app/views/admin/users/_profile.html.haml' + - 'app/views/admin/users/_projects.html.haml' + - 'app/views/admin/users/new.html.haml' + - 'app/views/admin/users/projects.html.haml' + - 'app/views/admin/users/show.html.haml' - 'app/views/authentication/_authenticate.html.haml' - 'app/views/authentication/_register.html.haml' - - "app/views/clusters/clusters/_cluster.html.haml" - - "app/views/clusters/clusters/new.html.haml" - - "app/views/dashboard/milestones/index.html.haml" - - "app/views/dashboard/projects/_blank_state_admin_welcome.html.haml" - - "app/views/dashboard/projects/_blank_state_welcome.html.haml" - - "app/views/dashboard/todos/_todo.html.haml" - - "app/views/dashboard/todos/index.html.haml" - - "app/views/devise/confirmations/almost_there.haml" - - "app/views/devise/mailer/_confirmation_instructions_account.html.haml" - - "app/views/devise/mailer/_confirmation_instructions_secondary.html.haml" - - "app/views/devise/mailer/email_changed.html.haml" - - "app/views/devise/mailer/password_change.html.haml" - - "app/views/devise/mailer/reset_password_instructions.html.haml" - - "app/views/devise/mailer/unlock_instructions.html.haml" - - "app/views/devise/passwords/edit.html.haml" - - "app/views/devise/sessions/_new_base.html.haml" - - "app/views/devise/sessions/_new_crowd.html.haml" - - "app/views/devise/sessions/_new_ldap.html.haml" - - "app/views/devise/sessions/new.html.haml" - - "app/views/devise/sessions/two_factor.html.haml" - - "app/views/devise/shared/_omniauth_box.html.haml" - - "app/views/devise/shared/_sign_in_link.html.haml" - - "app/views/devise/shared/_tabs_normal.html.haml" - - "app/views/discussions/_discussion.html.haml" - - "app/views/discussions/_headline.html.haml" - - "app/views/discussions/_notes.html.haml" - - "app/views/doorkeeper/applications/_delete_form.html.haml" - - "app/views/doorkeeper/authorized_applications/_delete_form.html.haml" - - "app/views/errors/encoding.html.haml" - - "app/views/errors/git_not_found.html.haml" - - "app/views/errors/omniauth_error.html.haml" - - "app/views/errors/precondition_failed.html.haml" - - "app/views/events/_event_push.atom.haml" - - "app/views/events/event/_push.html.haml" - - "app/views/groups/_create_chat_team.html.haml" - - "app/views/groups/_group_admin_settings.html.haml" - - "app/views/groups/labels/edit.html.haml" - - "app/views/groups/labels/new.html.haml" - - "app/views/groups/milestones/edit.html.haml" - - "app/views/groups/milestones/index.html.haml" - - "app/views/groups/milestones/new.html.haml" - - "app/views/groups/projects.html.haml" - - "app/views/groups/runners/edit.html.haml" - - "app/views/groups/settings/_advanced.html.haml" - - "app/views/groups/settings/_lfs.html.haml" - - "app/views/help/_shortcuts.html.haml" - - "app/views/help/index.html.haml" - - "app/views/help/instance_configuration.html.haml" - - "app/views/help/instance_configuration/_gitlab_ci.html.haml" - - "app/views/help/instance_configuration/_gitlab_pages.html.haml" - - "app/views/import/bitbucket/status.html.haml" - - "app/views/import/bitbucket_server/status.html.haml" - - "app/views/invites/show.html.haml" - - "app/views/jira_connect/subscriptions/index.html.haml" - - "app/views/layouts/_mailer.html.haml" - - "app/views/layouts/experiment_mailer.html.haml" - - "app/views/layouts/header/_default.html.haml" - - "app/views/layouts/header/_new_dropdown.haml" - - "app/views/layouts/jira_connect.html.haml" - - "app/views/layouts/notify.html.haml" - - "app/views/notify/_failed_builds.html.haml" - - "app/views/notify/_reassigned_issuable_email.html.haml" - - "app/views/notify/_removal_notification.html.haml" - - "app/views/notify/_successful_pipeline.html.haml" - - "app/views/notify/autodevops_disabled_email.html.haml" - - "app/views/notify/changed_milestone_email.html.haml" - - "app/views/notify/import_issues_csv_email.html.haml" - - "app/views/notify/issue_moved_email.html.haml" - - "app/views/notify/member_access_denied_email.html.haml" - - "app/views/notify/member_invite_accepted_email.html.haml" - - "app/views/notify/member_invited_email.html.haml" - - "app/views/notify/new_gpg_key_email.html.haml" - - "app/views/notify/new_mention_in_issue_email.html.haml" - - "app/views/notify/new_ssh_key_email.html.haml" - - "app/views/notify/new_user_email.html.haml" - - "app/views/notify/pages_domain_disabled_email.html.haml" - - "app/views/notify/pages_domain_enabled_email.html.haml" - - "app/views/notify/pages_domain_verification_failed_email.html.haml" - - "app/views/notify/pages_domain_verification_succeeded_email.html.haml" - - "app/views/notify/pipeline_failed_email.html.haml" - - "app/views/notify/project_was_exported_email.html.haml" - - "app/views/notify/project_was_moved_email.html.haml" - - "app/views/notify/project_was_not_exported_email.html.haml" - - "app/views/notify/push_to_merge_request_email.html.haml" - - "app/views/notify/remote_mirror_update_failed_email.html.haml" - - "app/views/notify/removed_milestone_issue_email.html.haml" - - "app/views/notify/removed_milestone_merge_request_email.html.haml" - - "app/views/notify/repository_push_email.html.haml" - - "app/views/profiles/chat_names/_chat_name.html.haml" - - "app/views/profiles/chat_names/index.html.haml" - - "app/views/profiles/chat_names/new.html.haml" - - "app/views/projects/_bitbucket_import_modal.html.haml" - - "app/views/projects/_customize_workflow.html.haml" - - "app/views/projects/_deletion_failed.html.haml" - - "app/views/projects/_fork_suggestion.html.haml" - - "app/views/projects/_gitlab_import_modal.html.haml" - - "app/views/projects/_home_panel.html.haml" - - "app/views/projects/_import_project_pane.html.haml" - - "app/views/projects/_issuable_by_email.html.haml" - - "app/views/projects/_readme.html.haml" - - "app/views/projects/artifacts/_artifact.html.haml" - - "app/views/projects/artifacts/_tree_file.html.haml" - - "app/views/projects/artifacts/browse.html.haml" - - "app/views/projects/blame/_age_map_legend.html.haml" - - "app/views/projects/blame/show.html.haml" - - "app/views/projects/blob/_editor.html.haml" - - "app/views/projects/blob/_header_content.html.haml" - - "app/views/projects/blob/_remove.html.haml" - - "app/views/projects/blob/_render_error.html.haml" - - "app/views/projects/blob/edit.html.haml" - - "app/views/projects/blob/new.html.haml" - - "app/views/projects/blob/preview.html.haml" - - "app/views/projects/blob/viewers/_empty.html.haml" - - "app/views/projects/blob/viewers/_stl.html.haml" - - "app/views/projects/branches/_branch.html.haml" - - "app/views/projects/branches/_delete_protected_modal.html.haml" - - "app/views/projects/branches/new.html.haml" - - "app/views/projects/ci/builds/_build.html.haml" - - "app/views/projects/ci/lints/_create.html.haml" - - "app/views/projects/compare/_form.html.haml" - - "app/views/projects/compare/index.html.haml" - - "app/views/projects/cycle_analytics/_empty_stage.html.haml" - - "app/views/projects/cycle_analytics/_no_access.html.haml" - - "app/views/projects/cycle_analytics/_overview.html.haml" - - "app/views/projects/cycle_analytics/show.html.haml" - - "app/views/projects/deploy_keys/_form.html.haml" - - "app/views/projects/deploy_keys/_index.html.haml" - - "app/views/projects/deploy_keys/edit.html.haml" - - "app/views/projects/deployments/_deployment.html.haml" - - "app/views/projects/diffs/_file_header.html.haml" - - "app/views/projects/diffs/_replaced_image_diff.html.haml" - - "app/views/projects/diffs/_stats.html.haml" - - "app/views/projects/empty.html.haml" - - "app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml" - - "app/views/projects/hook_logs/_index.html.haml" - - "app/views/projects/hook_logs/show.html.haml" - - "app/views/projects/hooks/edit.html.haml" - - "app/views/projects/imports/new.html.haml" - - "app/views/projects/imports/show.html.haml" - - "app/views/projects/issues/_new_branch.html.haml" - - "app/views/projects/issues/import_csv/_modal.html.haml" - - "app/views/projects/issues/show.html.haml" - - "app/views/projects/jobs/_header.html.haml" - - "app/views/projects/jobs/_table.html.haml" - - "app/views/projects/jobs/index.html.haml" - - "app/views/projects/labels/edit.html.haml" - - "app/views/projects/labels/new.html.haml" - - "app/views/projects/mattermosts/_no_teams.html.haml" - - "app/views/projects/mattermosts/_team_selection.html.haml" - - "app/views/projects/mattermosts/new.html.haml" - - "app/views/projects/merge_requests/_commits.html.haml" - - "app/views/projects/merge_requests/_how_to_merge.html.haml" - - "app/views/projects/merge_requests/_mr_title.html.haml" - - "app/views/projects/merge_requests/conflicts/_commit_stats.html.haml" - - "app/views/projects/merge_requests/conflicts/_file_actions.html.haml" - - "app/views/projects/merge_requests/conflicts/_submit_form.html.haml" - - "app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml" - - "app/views/projects/merge_requests/conflicts/components/_inline_conflict_lines.html.haml" - - "app/views/projects/merge_requests/conflicts/show.html.haml" - - "app/views/projects/merge_requests/creations/_diffs.html.haml" - - "app/views/projects/merge_requests/creations/_new_compare.html.haml" - - "app/views/projects/merge_requests/creations/_new_submit.html.haml" - - "app/views/projects/merge_requests/diffs/_different_base.html.haml" - - "app/views/projects/merge_requests/diffs/_diffs.html.haml" - - "app/views/projects/merge_requests/diffs/_version_controls.html.haml" - - "app/views/projects/merge_requests/invalid.html.haml" - - "app/views/projects/merge_requests/widget/open/_error.html.haml" - - "app/views/projects/mirrors/_regenerate_public_ssh_key_confirm_modal.html.haml" - - "app/views/projects/mirrors/_ssh_host_keys.html.haml" - - "app/views/projects/no_repo.html.haml" - - "app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml" - - "app/views/projects/pipelines/_info.html.haml" - - "app/views/projects/protected_branches/shared/_dropdown.html.haml" - - "app/views/projects/protected_branches/shared/_index.html.haml" - - "app/views/projects/protected_branches/shared/_matching_branch.html.haml" - - "app/views/projects/protected_branches/shared/_protected_branch.html.haml" - - "app/views/projects/protected_branches/show.html.haml" - - "app/views/projects/protected_tags/shared/_create_protected_tag.html.haml" - - "app/views/projects/protected_tags/shared/_dropdown.html.haml" - - "app/views/projects/protected_tags/shared/_index.html.haml" - - "app/views/projects/protected_tags/shared/_matching_tag.html.haml" - - "app/views/projects/protected_tags/shared/_protected_tag.html.haml" - - "app/views/projects/protected_tags/shared/_tags_list.html.haml" - - "app/views/projects/protected_tags/show.html.haml" - - "app/views/projects/registry/repositories/_tag.html.haml" - - "app/views/projects/repositories/_feed.html.haml" - - "app/views/projects/runners/_shared_runners.html.haml" - - "app/views/projects/runners/edit.html.haml" - - "app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml" - - "app/views/projects/services/mattermost_slash_commands/_help.html.haml" - - "app/views/projects/services/prometheus/_metrics.html.haml" - - "app/views/projects/services/slack_slash_commands/_help.html.haml" - - "app/views/projects/settings/ci_cd/_badge.html.haml" - - "app/views/projects/settings/ci_cd/_form.html.haml" - - "app/views/projects/tags/index.html.haml" - - "app/views/projects/tags/releases/edit.html.haml" - - "app/views/projects/tree/_tree_row.html.haml" - - "app/views/projects/tree/_truncated_notice_tree_row.html.haml" - - "app/views/projects/triggers/_form.html.haml" - - "app/views/projects/triggers/_index.html.haml" - - "app/views/projects/triggers/_trigger.html.haml" - - "app/views/projects/triggers/edit.html.haml" - - "app/views/search/results/_issue.html.haml" - - "app/views/search/results/_note.html.haml" - - "app/views/search/results/_snippet_blob.html.haml" - - "app/views/search/results/_snippet_title.html.haml" - - "app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml" - - "app/views/shared/_commit_message_container.html.haml" - - "app/views/shared/_delete_label_modal.html.haml" - - "app/views/shared/_group_form.html.haml" - - "app/views/shared/_group_tips.html.haml" - - "app/views/shared/_md_preview.html.haml" - - "app/views/shared/_milestone_expired.html.haml" - - "app/views/shared/_no_password.html.haml" - - "app/views/shared/_ping_consent.html.haml" - - "app/views/shared/_project_limit.html.haml" - - "app/views/shared/boards/components/_sidebar.html.haml" - - "app/views/shared/boards/components/sidebar/_due_date.html.haml" - - "app/views/shared/boards/components/sidebar/_labels.html.haml" - - "app/views/shared/boards/components/sidebar/_milestone.html.haml" - - "app/views/shared/hook_logs/_content.html.haml" - - "app/views/shared/issuable/_assignees.html.haml" - - "app/views/shared/issuable/_board_create_list_dropdown.html.haml" - - "app/views/shared/issuable/_close_reopen_report_toggle.html.haml" - - "app/views/shared/issuable/_form.html.haml" - - "app/views/shared/issuable/_search_bar.html.haml" - - "app/views/shared/issuable/_sidebar.html.haml" - - "app/views/shared/issuable/form/_default_templates.html.haml" - - "app/views/shared/issuable/form/_template_selector.html.haml" - - "app/views/shared/issuable/form/_title.html.haml" - - "app/views/shared/labels/_form.html.haml" - - "app/views/shared/members/_member.html.haml" - - "app/views/shared/milestones/_form_dates.html.haml" - - "app/views/shared/milestones/_issuable.html.haml" - - "app/views/shared/milestones/_milestone.html.haml" - - "app/views/shared/milestones/_sidebar.html.haml" - - "app/views/shared/milestones/_top.html.haml" - - "app/views/shared/notes/_hints.html.haml" - - "app/views/shared/notifications/_button.html.haml" - - "app/views/shared/notifications/_new_button.html.haml" - - "app/views/shared/runners/_runner_description.html.haml" - - "app/views/shared/runners/show.html.haml" - - "app/views/shared/snippets/_header.html.haml" - - "app/views/shared/snippets/_snippet.html.haml" - - "app/views/shared/web_hooks/_form.html.haml" - - "app/views/shared/web_hooks/_hook.html.haml" - - "app/views/shared/wikis/_pages_wiki_page.html.haml" - - "app/views/users/_deletion_guidance.html.haml" - - "ee/app/views/admin/_namespace_plan_info.html.haml" - - "ee/app/views/admin/application_settings/_templates.html.haml" - - "ee/app/views/admin/audit_logs/index.html.haml" - - "ee/app/views/admin/emails/show.html.haml" - - "ee/app/views/admin/geo/projects/_registry_failed.html.haml" - - "ee/app/views/admin/geo/projects/_registry_never.html.haml" - - "ee/app/views/admin/licenses/_upload_trial_license.html.haml" - - "ee/app/views/admin/licenses/new.html.haml" - - "ee/app/views/admin/monitoring/ee/_nav.html.haml" - - "ee/app/views/admin/projects/_shared_runner_status.html.haml" - - "ee/app/views/admin/users/_auditor_access_level_radio.html.haml" - - "ee/app/views/admin/users/_auditor_user_badge.html.haml" - - "ee/app/views/admin/users/_limits.html.haml" - - "ee/app/views/admin/users/_user_detail_note.html.haml" - - "ee/app/views/dashboard/projects/_blank_state_ee_trial.html.haml" - - "ee/app/views/errors/kerberos_denied.html.haml" - - "ee/app/views/groups/ee/_settings_nav.html.haml" - - "ee/app/views/groups/group_members/_ldap_sync.html.haml" - - "ee/app/views/groups/group_members/_sync_button.html.haml" - - "ee/app/views/groups/hooks/edit.html.haml" - - "ee/app/views/groups/ldap_group_links/index.html.haml" - - "ee/app/views/layouts/nav/ee/admin/_new_monitoring_sidebar.html.haml" - - "ee/app/views/layouts/service_desk.html.haml" - - "ee/app/views/ldap_group_links/_form.html.haml" - - "ee/app/views/ldap_group_links/_ldap_group_link.html.haml" - - "ee/app/views/ldap_group_links/_ldap_group_links.html.haml" - - "ee/app/views/ldap_group_links/_ldap_group_links_show.html.haml" - - "ee/app/views/ldap_group_links/_ldap_group_links_synchronizations.html.haml" - - "ee/app/views/namespaces/_shared_runner_status.html.haml" - - "ee/app/views/namespaces/_shared_runners_minutes_setting.html.haml" - - "ee/app/views/namespaces/pipelines_quota/_extra_shared_runners_minutes_quota.html.haml" - - "ee/app/views/namespaces/pipelines_quota/_list.haml" - - "ee/app/views/notify/approved_merge_request_email.html.haml" - - "ee/app/views/notify/epic_status_changed_email.html.haml" - - "ee/app/views/notify/new_review_email.html.haml" - - "ee/app/views/notify/send_admin_notification.html.haml" - - "ee/app/views/notify/send_unsubscribed_notification.html.haml" - - "ee/app/views/notify/unapproved_merge_request_email.html.haml" - - "ee/app/views/oauth/geo_auth/error.html.haml" - - "ee/app/views/projects/commits/_mirror_status.html.haml" - - "ee/app/views/projects/merge_requests/_approvals_count.html.haml" - - "ee/app/views/projects/merge_requests/widget/open/_geo.html.haml" - - "ee/app/views/projects/mirrors/_mirrored_repositories_count.html.haml" - - "ee/app/views/projects/protected_branches/_update_protected_branch.html.haml" - - "ee/app/views/projects/protected_branches/ee/_create_protected_branch.html.haml" - - "ee/app/views/projects/protected_branches/ee/_dropdown.html.haml" - - "ee/app/views/projects/protected_tags/_protected_tag_extra_create_access_levels.haml" - - "ee/app/views/projects/protected_tags/ee/_create_protected_tag.html.haml" - - "ee/app/views/projects/push_rules/_index.html.haml" - - "ee/app/views/projects/services/gitlab_slack_application/_help.html.haml" - - "ee/app/views/projects/services/gitlab_slack_application/_slack_integration_form.html.haml" - - "ee/app/views/projects/settings/slacks/edit.html.haml" - - "ee/app/views/shared/_mirror_update_button.html.haml" - - "ee/app/views/shared/epic/_search_bar.html.haml" - - "ee/app/views/shared/issuable/_approvals.html.haml" - - "ee/app/views/shared/issuable/_board_create_list_dropdown.html.haml" - - "ee/app/views/shared/issuable/_filter_weight.html.haml" - - "ee/app/views/shared/members/ee/_ldap_tag.html.haml" - - "ee/app/views/shared/members/ee/_override_member_buttons.html.haml" - - "ee/app/views/shared/members/ee/_sso_badge.html.haml" - - "ee/app/views/shared/milestones/_burndown.html.haml" - - "ee/app/views/shared/milestones/_weight.html.haml" - - "ee/app/views/shared/promotions/_promote_issue_weights.html.haml" - - "ee/app/views/shared/promotions/_promote_repository_features.html.haml" - - "ee/app/views/shared/promotions/_promote_servicedesk.html.haml" - - "ee/app/views/shared/push_rules/_form.html.haml" - - "ee/app/views/unsubscribes/show.html.haml" + - 'app/views/clusters/clusters/_cluster.html.haml' + - 'app/views/clusters/clusters/new.html.haml' + - 'app/views/dashboard/milestones/index.html.haml' + - 'app/views/dashboard/projects/_blank_state_admin_welcome.html.haml' + - 'app/views/dashboard/projects/_blank_state_welcome.html.haml' + - 'app/views/dashboard/todos/_todo.html.haml' + - 'app/views/dashboard/todos/index.html.haml' + - 'app/views/devise/confirmations/almost_there.haml' + - 'app/views/devise/mailer/_confirmation_instructions_account.html.haml' + - 'app/views/devise/mailer/_confirmation_instructions_secondary.html.haml' + - 'app/views/devise/mailer/email_changed.html.haml' + - 'app/views/devise/mailer/password_change.html.haml' + - 'app/views/devise/mailer/reset_password_instructions.html.haml' + - 'app/views/devise/mailer/unlock_instructions.html.haml' + - 'app/views/devise/passwords/edit.html.haml' + - 'app/views/devise/sessions/_new_base.html.haml' + - 'app/views/devise/sessions/_new_crowd.html.haml' + - 'app/views/devise/sessions/_new_ldap.html.haml' + - 'app/views/devise/sessions/new.html.haml' + - 'app/views/devise/sessions/two_factor.html.haml' + - 'app/views/devise/shared/_omniauth_box.html.haml' + - 'app/views/devise/shared/_sign_in_link.html.haml' + - 'app/views/devise/shared/_tabs_normal.html.haml' + - 'app/views/discussions/_discussion.html.haml' + - 'app/views/discussions/_headline.html.haml' + - 'app/views/discussions/_notes.html.haml' + - 'app/views/doorkeeper/applications/_delete_form.html.haml' + - 'app/views/doorkeeper/authorized_applications/_delete_form.html.haml' + - 'app/views/errors/encoding.html.haml' + - 'app/views/errors/git_not_found.html.haml' + - 'app/views/errors/omniauth_error.html.haml' + - 'app/views/errors/precondition_failed.html.haml' + - 'app/views/events/_event_push.atom.haml' + - 'app/views/events/event/_push.html.haml' + - 'app/views/groups/_create_chat_team.html.haml' + - 'app/views/groups/_group_admin_settings.html.haml' + - 'app/views/groups/labels/edit.html.haml' + - 'app/views/groups/labels/new.html.haml' + - 'app/views/groups/milestones/edit.html.haml' + - 'app/views/groups/milestones/index.html.haml' + - 'app/views/groups/milestones/new.html.haml' + - 'app/views/groups/projects.html.haml' + - 'app/views/groups/runners/edit.html.haml' + - 'app/views/groups/settings/_advanced.html.haml' + - 'app/views/groups/settings/_lfs.html.haml' + - 'app/views/help/_shortcuts.html.haml' + - 'app/views/help/index.html.haml' + - 'app/views/help/instance_configuration.html.haml' + - 'app/views/help/instance_configuration/_gitlab_ci.html.haml' + - 'app/views/help/instance_configuration/_gitlab_pages.html.haml' + - 'app/views/import/bitbucket/status.html.haml' + - 'app/views/import/bitbucket_server/status.html.haml' + - 'app/views/invites/show.html.haml' + - 'app/views/jira_connect/subscriptions/index.html.haml' + - 'app/views/layouts/_mailer.html.haml' + - 'app/views/layouts/experiment_mailer.html.haml' + - 'app/views/layouts/header/_default.html.haml' + - 'app/views/layouts/header/_new_dropdown.haml' + - 'app/views/layouts/jira_connect.html.haml' + - 'app/views/layouts/notify.html.haml' + - 'app/views/notify/_failed_builds.html.haml' + - 'app/views/notify/_reassigned_issuable_email.html.haml' + - 'app/views/notify/_removal_notification.html.haml' + - 'app/views/notify/_successful_pipeline.html.haml' + - 'app/views/notify/autodevops_disabled_email.html.haml' + - 'app/views/notify/changed_milestone_email.html.haml' + - 'app/views/notify/import_issues_csv_email.html.haml' + - 'app/views/notify/issue_moved_email.html.haml' + - 'app/views/notify/member_access_denied_email.html.haml' + - 'app/views/notify/member_invite_accepted_email.html.haml' + - 'app/views/notify/member_invited_email.html.haml' + - 'app/views/notify/new_gpg_key_email.html.haml' + - 'app/views/notify/new_mention_in_issue_email.html.haml' + - 'app/views/notify/new_ssh_key_email.html.haml' + - 'app/views/notify/new_user_email.html.haml' + - 'app/views/notify/pages_domain_disabled_email.html.haml' + - 'app/views/notify/pages_domain_enabled_email.html.haml' + - 'app/views/notify/pages_domain_verification_failed_email.html.haml' + - 'app/views/notify/pages_domain_verification_succeeded_email.html.haml' + - 'app/views/notify/pipeline_failed_email.html.haml' + - 'app/views/notify/project_was_exported_email.html.haml' + - 'app/views/notify/project_was_moved_email.html.haml' + - 'app/views/notify/project_was_not_exported_email.html.haml' + - 'app/views/notify/push_to_merge_request_email.html.haml' + - 'app/views/notify/remote_mirror_update_failed_email.html.haml' + - 'app/views/notify/removed_milestone_issue_email.html.haml' + - 'app/views/notify/removed_milestone_merge_request_email.html.haml' + - 'app/views/notify/repository_push_email.html.haml' + - 'app/views/profiles/chat_names/_chat_name.html.haml' + - 'app/views/profiles/chat_names/index.html.haml' + - 'app/views/profiles/chat_names/new.html.haml' + - 'app/views/projects/_bitbucket_import_modal.html.haml' + - 'app/views/projects/_customize_workflow.html.haml' + - 'app/views/projects/_deletion_failed.html.haml' + - 'app/views/projects/_fork_suggestion.html.haml' + - 'app/views/projects/_gitlab_import_modal.html.haml' + - 'app/views/projects/_home_panel.html.haml' + - 'app/views/projects/_import_project_pane.html.haml' + - 'app/views/projects/_issuable_by_email.html.haml' + - 'app/views/projects/_readme.html.haml' + - 'app/views/projects/artifacts/_artifact.html.haml' + - 'app/views/projects/artifacts/_tree_file.html.haml' + - 'app/views/projects/artifacts/browse.html.haml' + - 'app/views/projects/blame/_age_map_legend.html.haml' + - 'app/views/projects/blame/show.html.haml' + - 'app/views/projects/blob/_editor.html.haml' + - 'app/views/projects/blob/_header_content.html.haml' + - 'app/views/projects/blob/_remove.html.haml' + - 'app/views/projects/blob/_render_error.html.haml' + - 'app/views/projects/blob/edit.html.haml' + - 'app/views/projects/blob/new.html.haml' + - 'app/views/projects/blob/preview.html.haml' + - 'app/views/projects/blob/viewers/_empty.html.haml' + - 'app/views/projects/blob/viewers/_stl.html.haml' + - 'app/views/projects/branches/_branch.html.haml' + - 'app/views/projects/branches/_delete_protected_modal.html.haml' + - 'app/views/projects/branches/new.html.haml' + - 'app/views/projects/ci/builds/_build.html.haml' + - 'app/views/projects/ci/lints/_create.html.haml' + - 'app/views/projects/compare/_form.html.haml' + - 'app/views/projects/compare/index.html.haml' + - 'app/views/projects/cycle_analytics/_empty_stage.html.haml' + - 'app/views/projects/cycle_analytics/_no_access.html.haml' + - 'app/views/projects/cycle_analytics/_overview.html.haml' + - 'app/views/projects/cycle_analytics/show.html.haml' + - 'app/views/projects/deploy_keys/_form.html.haml' + - 'app/views/projects/deploy_keys/_index.html.haml' + - 'app/views/projects/deploy_keys/edit.html.haml' + - 'app/views/projects/deployments/_deployment.html.haml' + - 'app/views/projects/diffs/_file_header.html.haml' + - 'app/views/projects/diffs/_replaced_image_diff.html.haml' + - 'app/views/projects/diffs/_stats.html.haml' + - 'app/views/projects/empty.html.haml' + - 'app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml' + - 'app/views/projects/hook_logs/_index.html.haml' + - 'app/views/projects/hook_logs/show.html.haml' + - 'app/views/projects/hooks/edit.html.haml' + - 'app/views/projects/imports/new.html.haml' + - 'app/views/projects/imports/show.html.haml' + - 'app/views/projects/issues/_new_branch.html.haml' + - 'app/views/projects/issues/import_csv/_modal.html.haml' + - 'app/views/projects/issues/show.html.haml' + - 'app/views/projects/jobs/_header.html.haml' + - 'app/views/projects/jobs/_table.html.haml' + - 'app/views/projects/jobs/index.html.haml' + - 'app/views/projects/labels/edit.html.haml' + - 'app/views/projects/labels/new.html.haml' + - 'app/views/projects/mattermosts/_no_teams.html.haml' + - 'app/views/projects/mattermosts/_team_selection.html.haml' + - 'app/views/projects/mattermosts/new.html.haml' + - 'app/views/projects/merge_requests/_commits.html.haml' + - 'app/views/projects/merge_requests/_how_to_merge.html.haml' + - 'app/views/projects/merge_requests/_mr_title.html.haml' + - 'app/views/projects/merge_requests/conflicts/_commit_stats.html.haml' + - 'app/views/projects/merge_requests/conflicts/_file_actions.html.haml' + - 'app/views/projects/merge_requests/conflicts/_submit_form.html.haml' + - 'app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml' + - 'app/views/projects/merge_requests/conflicts/components/_inline_conflict_lines.html.haml' + - 'app/views/projects/merge_requests/conflicts/show.html.haml' + - 'app/views/projects/merge_requests/creations/_diffs.html.haml' + - 'app/views/projects/merge_requests/creations/_new_compare.html.haml' + - 'app/views/projects/merge_requests/creations/_new_submit.html.haml' + - 'app/views/projects/merge_requests/diffs/_different_base.html.haml' + - 'app/views/projects/merge_requests/diffs/_diffs.html.haml' + - 'app/views/projects/merge_requests/diffs/_version_controls.html.haml' + - 'app/views/projects/merge_requests/invalid.html.haml' + - 'app/views/projects/merge_requests/widget/open/_error.html.haml' + - 'app/views/projects/mirrors/_regenerate_public_ssh_key_confirm_modal.html.haml' + - 'app/views/projects/mirrors/_ssh_host_keys.html.haml' + - 'app/views/projects/no_repo.html.haml' + - 'app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml' + - 'app/views/projects/pipelines/_info.html.haml' + - 'app/views/projects/protected_branches/shared/_dropdown.html.haml' + - 'app/views/projects/protected_branches/shared/_index.html.haml' + - 'app/views/projects/protected_branches/shared/_matching_branch.html.haml' + - 'app/views/projects/protected_branches/shared/_protected_branch.html.haml' + - 'app/views/projects/protected_branches/show.html.haml' + - 'app/views/projects/protected_tags/shared/_create_protected_tag.html.haml' + - 'app/views/projects/protected_tags/shared/_dropdown.html.haml' + - 'app/views/projects/protected_tags/shared/_index.html.haml' + - 'app/views/projects/protected_tags/shared/_matching_tag.html.haml' + - 'app/views/projects/protected_tags/shared/_protected_tag.html.haml' + - 'app/views/projects/protected_tags/shared/_tags_list.html.haml' + - 'app/views/projects/protected_tags/show.html.haml' + - 'app/views/projects/registry/repositories/_tag.html.haml' + - 'app/views/projects/repositories/_feed.html.haml' + - 'app/views/projects/runners/_shared_runners.html.haml' + - 'app/views/projects/runners/edit.html.haml' + - 'app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml' + - 'app/views/projects/services/mattermost_slash_commands/_help.html.haml' + - 'app/views/projects/services/prometheus/_metrics.html.haml' + - 'app/views/projects/services/slack_slash_commands/_help.html.haml' + - 'app/views/projects/settings/ci_cd/_badge.html.haml' + - 'app/views/projects/settings/ci_cd/_form.html.haml' + - 'app/views/projects/tags/index.html.haml' + - 'app/views/projects/tags/releases/edit.html.haml' + - 'app/views/projects/tree/_tree_row.html.haml' + - 'app/views/projects/tree/_truncated_notice_tree_row.html.haml' + - 'app/views/projects/triggers/_form.html.haml' + - 'app/views/projects/triggers/_index.html.haml' + - 'app/views/projects/triggers/_trigger.html.haml' + - 'app/views/projects/triggers/edit.html.haml' + - 'app/views/search/results/_issue.html.haml' + - 'app/views/search/results/_note.html.haml' + - 'app/views/search/results/_snippet_blob.html.haml' + - 'app/views/search/results/_snippet_title.html.haml' + - 'app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml' + - 'app/views/shared/_commit_message_container.html.haml' + - 'app/views/shared/_delete_label_modal.html.haml' + - 'app/views/shared/_group_form.html.haml' + - 'app/views/shared/_group_tips.html.haml' + - 'app/views/shared/_md_preview.html.haml' + - 'app/views/shared/_milestone_expired.html.haml' + - 'app/views/shared/_no_password.html.haml' + - 'app/views/shared/_ping_consent.html.haml' + - 'app/views/shared/_project_limit.html.haml' + - 'app/views/shared/boards/components/_sidebar.html.haml' + - 'app/views/shared/boards/components/sidebar/_due_date.html.haml' + - 'app/views/shared/boards/components/sidebar/_labels.html.haml' + - 'app/views/shared/boards/components/sidebar/_milestone.html.haml' + - 'app/views/shared/hook_logs/_content.html.haml' + - 'app/views/shared/issuable/_assignees.html.haml' + - 'app/views/shared/issuable/_board_create_list_dropdown.html.haml' + - 'app/views/shared/issuable/_close_reopen_report_toggle.html.haml' + - 'app/views/shared/issuable/_form.html.haml' + - 'app/views/shared/issuable/_search_bar.html.haml' + - 'app/views/shared/issuable/_sidebar.html.haml' + - 'app/views/shared/issuable/form/_default_templates.html.haml' + - 'app/views/shared/issuable/form/_template_selector.html.haml' + - 'app/views/shared/issuable/form/_title.html.haml' + - 'app/views/shared/labels/_form.html.haml' + - 'app/views/shared/members/_member.html.haml' + - 'app/views/shared/milestones/_form_dates.html.haml' + - 'app/views/shared/milestones/_issuable.html.haml' + - 'app/views/shared/milestones/_milestone.html.haml' + - 'app/views/shared/milestones/_sidebar.html.haml' + - 'app/views/shared/milestones/_top.html.haml' + - 'app/views/shared/notes/_hints.html.haml' + - 'app/views/shared/notifications/_button.html.haml' + - 'app/views/shared/notifications/_new_button.html.haml' + - 'app/views/shared/runners/_runner_description.html.haml' + - 'app/views/shared/runners/show.html.haml' + - 'app/views/shared/snippets/_header.html.haml' + - 'app/views/shared/snippets/_snippet.html.haml' + - 'app/views/shared/web_hooks/_form.html.haml' + - 'app/views/shared/web_hooks/_hook.html.haml' + - 'app/views/shared/wikis/_pages_wiki_page.html.haml' + - 'app/views/users/_deletion_guidance.html.haml' + - 'ee/app/views/admin/_namespace_plan_info.html.haml' + - 'ee/app/views/admin/application_settings/_templates.html.haml' + - 'ee/app/views/admin/audit_logs/index.html.haml' + - 'ee/app/views/admin/emails/show.html.haml' + - 'ee/app/views/admin/geo/projects/_registry_failed.html.haml' + - 'ee/app/views/admin/geo/projects/_registry_never.html.haml' + - 'ee/app/views/admin/licenses/_upload_trial_license.html.haml' + - 'ee/app/views/admin/licenses/new.html.haml' + - 'ee/app/views/admin/monitoring/ee/_nav.html.haml' + - 'ee/app/views/admin/projects/_shared_runner_status.html.haml' + - 'ee/app/views/admin/users/_auditor_access_level_radio.html.haml' + - 'ee/app/views/admin/users/_auditor_user_badge.html.haml' + - 'ee/app/views/admin/users/_limits.html.haml' + - 'ee/app/views/admin/users/_user_detail_note.html.haml' + - 'ee/app/views/dashboard/projects/_blank_state_ee_trial.html.haml' + - 'ee/app/views/errors/kerberos_denied.html.haml' + - 'ee/app/views/groups/ee/_settings_nav.html.haml' + - 'ee/app/views/groups/group_members/_ldap_sync.html.haml' + - 'ee/app/views/groups/group_members/_sync_button.html.haml' + - 'ee/app/views/groups/hooks/edit.html.haml' + - 'ee/app/views/groups/ldap_group_links/index.html.haml' + - 'ee/app/views/layouts/nav/ee/admin/_new_monitoring_sidebar.html.haml' + - 'ee/app/views/layouts/service_desk.html.haml' + - 'ee/app/views/ldap_group_links/_form.html.haml' + - 'ee/app/views/ldap_group_links/_ldap_group_link.html.haml' + - 'ee/app/views/ldap_group_links/_ldap_group_links.html.haml' + - 'ee/app/views/ldap_group_links/_ldap_group_links_show.html.haml' + - 'ee/app/views/namespaces/_shared_runner_status.html.haml' + - 'ee/app/views/namespaces/_shared_runners_minutes_setting.html.haml' + - 'ee/app/views/namespaces/pipelines_quota/_extra_shared_runners_minutes_quota.html.haml' + - 'ee/app/views/namespaces/pipelines_quota/_list.haml' + - 'ee/app/views/notify/approved_merge_request_email.html.haml' + - 'ee/app/views/notify/epic_status_changed_email.html.haml' + - 'ee/app/views/notify/new_review_email.html.haml' + - 'ee/app/views/notify/send_admin_notification.html.haml' + - 'ee/app/views/notify/send_unsubscribed_notification.html.haml' + - 'ee/app/views/notify/unapproved_merge_request_email.html.haml' + - 'ee/app/views/oauth/geo_auth/error.html.haml' + - 'ee/app/views/projects/commits/_mirror_status.html.haml' + - 'ee/app/views/projects/merge_requests/_approvals_count.html.haml' + - 'ee/app/views/projects/merge_requests/widget/open/_geo.html.haml' + - 'ee/app/views/projects/mirrors/_mirrored_repositories_count.html.haml' + - 'ee/app/views/projects/protected_branches/_update_protected_branch.html.haml' + - 'ee/app/views/projects/protected_branches/ee/_create_protected_branch.html.haml' + - 'ee/app/views/projects/protected_branches/ee/_dropdown.html.haml' + - 'ee/app/views/projects/protected_tags/_protected_tag_extra_create_access_levels.haml' + - 'ee/app/views/projects/protected_tags/ee/_create_protected_tag.html.haml' + - 'ee/app/views/projects/push_rules/_index.html.haml' + - 'ee/app/views/projects/services/gitlab_slack_application/_help.html.haml' + - 'ee/app/views/projects/services/gitlab_slack_application/_slack_integration_form.html.haml' + - 'ee/app/views/projects/settings/slacks/edit.html.haml' + - 'ee/app/views/shared/_mirror_update_button.html.haml' + - 'ee/app/views/shared/epic/_search_bar.html.haml' + - 'ee/app/views/shared/issuable/_approvals.html.haml' + - 'ee/app/views/shared/issuable/_board_create_list_dropdown.html.haml' + - 'ee/app/views/shared/issuable/_filter_weight.html.haml' + - 'ee/app/views/shared/members/ee/_ldap_tag.html.haml' + - 'ee/app/views/shared/members/ee/_override_member_buttons.html.haml' + - 'ee/app/views/shared/members/ee/_sso_badge.html.haml' + - 'ee/app/views/shared/milestones/_burndown.html.haml' + - 'ee/app/views/shared/milestones/_weight.html.haml' + - 'ee/app/views/shared/promotions/_promote_issue_weights.html.haml' + - 'ee/app/views/shared/promotions/_promote_repository_features.html.haml' + - 'ee/app/views/shared/promotions/_promote_servicedesk.html.haml' + - 'ee/app/views/shared/push_rules/_form.html.haml' + - 'ee/app/views/unsubscribes/show.html.haml' diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.vue b/app/assets/javascripts/commit/pipelines/pipelines_table.vue index 2f4118c1717..188d958ba86 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_table.vue +++ b/app/assets/javascripts/commit/pipelines/pipelines_table.vue @@ -1,6 +1,5 @@ + + diff --git a/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue b/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue new file mode 100644 index 00000000000..45707c18f7b --- /dev/null +++ b/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue @@ -0,0 +1,107 @@ + + + diff --git a/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar.vue b/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar.vue new file mode 100644 index 00000000000..9fa3fa38eac --- /dev/null +++ b/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar.vue @@ -0,0 +1,43 @@ + + + diff --git a/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue b/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue new file mode 100644 index 00000000000..b1b04564a62 --- /dev/null +++ b/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue @@ -0,0 +1,84 @@ + + + diff --git a/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue b/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue new file mode 100644 index 00000000000..437f28907fd --- /dev/null +++ b/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue @@ -0,0 +1,64 @@ + + diff --git a/app/assets/javascripts/sidebar/components/reviewers/reviewers.vue b/app/assets/javascripts/sidebar/components/reviewers/reviewers.vue new file mode 100644 index 00000000000..6a3d88f6385 --- /dev/null +++ b/app/assets/javascripts/sidebar/components/reviewers/reviewers.vue @@ -0,0 +1,72 @@ + + + diff --git a/app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue b/app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue new file mode 100644 index 00000000000..5d8a2e6fa65 --- /dev/null +++ b/app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue @@ -0,0 +1,107 @@ + + + diff --git a/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue b/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue new file mode 100644 index 00000000000..2ae4a114b36 --- /dev/null +++ b/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue @@ -0,0 +1,103 @@ + + + diff --git a/app/assets/javascripts/sidebar/mount_sidebar.js b/app/assets/javascripts/sidebar/mount_sidebar.js index 047d9a4d0e8..ffc7f2c07ba 100644 --- a/app/assets/javascripts/sidebar/mount_sidebar.js +++ b/app/assets/javascripts/sidebar/mount_sidebar.js @@ -5,6 +5,7 @@ import Vuex from 'vuex'; import SidebarTimeTracking from './components/time_tracking/sidebar_time_tracking.vue'; import SidebarAssignees from './components/assignees/sidebar_assignees.vue'; import SidebarLabels from './components/labels/sidebar_labels.vue'; +import SidebarReviewers from './components/reviewers/sidebar_reviewers.vue'; import ConfidentialIssueSidebar from './components/confidential/confidential_issue_sidebar.vue'; import SidebarMoveIssue from './lib/sidebar_move_issue'; import IssuableLockForm from './components/lock/issuable_lock_form.vue'; @@ -56,6 +57,36 @@ function mountAssigneesComponent(mediator) { }); } +function mountReviewersComponent(mediator) { + const el = document.getElementById('js-vue-sidebar-reviewers'); + const apolloProvider = new VueApollo({ + defaultClient: createDefaultClient(), + }); + + if (!el) return; + + const { iid, fullPath } = getSidebarOptions(); + // eslint-disable-next-line no-new + new Vue({ + el, + apolloProvider, + components: { + SidebarReviewers, + }, + render: createElement => + createElement('sidebar-reviewers', { + props: { + mediator, + issuableIid: String(iid), + projectPath: fullPath, + field: el.dataset.field, + signedIn: el.hasAttribute('data-signed-in'), + issuableType: isInIssuePage() ? 'issue' : 'merge_request', + }, + }), + }); +} + export function mountSidebarLabels() { const el = document.querySelector('.js-sidebar-labels'); @@ -245,6 +276,7 @@ function mountSeverityComponent() { export function mountSidebar(mediator) { mountAssigneesComponent(mediator); + mountReviewersComponent(mediator); mountConfidentialComponent(mediator); mountLockComponent(); mountParticipantsComponent(mediator); diff --git a/app/assets/javascripts/tooltips/index.js b/app/assets/javascripts/tooltips/index.js index cfbd88d6c40..debb36dc53f 100644 --- a/app/assets/javascripts/tooltips/index.js +++ b/app/assets/javascripts/tooltips/index.js @@ -58,6 +58,8 @@ const applyToElements = (elements, handler) => toArray(elements).forEach(handler const invokeBootstrapApi = (elements, method) => { if (isFunction(elements.tooltip)) { + elements.tooltip(method); + } else { jQuery(elements).tooltip(method); } }; diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue index 61cc950f058..be9d37e4531 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue @@ -3,6 +3,7 @@ import $ from 'jquery'; import { GlButton } from '@gitlab/ui'; import { __ } from '~/locale'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import MergeRequest from '~/merge_request'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import mergeRequestQueryVariablesMixin from '../../mixins/merge_request_query_variables'; import getStateQuery from '../../queries/get_state.query.graphql'; @@ -128,8 +129,7 @@ export default { .then(res => res.data) .then(data => { eventHub.$emit('UpdateWidgetData', data); - createFlash(__('The merge request can now be merged.'), 'notice'); - $('.merge-request .detail-page-description .title').text(this.mr.title); + MergeRequest.toggleDraftStatus(this.mr.title, true); }) .catch(() => { this.isMakingRequest = false; diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue index 01d3ab1033c..c8dee81d746 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue @@ -1,6 +1,7 @@