From 06b21ad63ca4f7d0cada7cc44b9cddbf17df2193 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 16 Mar 2022 21:09:14 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/review-apps/qa.gitlab-ci.yml | 7 +- .../diffs/components/hidden_files_warning.vue | 52 +++++--- .../ide/components/repo_editor.vue | 12 +- .../javascripts/lib/utils/common_utils.js | 13 -- .../javascripts/lib/utils/url_utility.js | 14 +++ app/assets/javascripts/merge_request_tabs.js | 9 +- .../components/details_page/delete_alert.vue | 14 ++- .../explorer/constants/details.js | 6 + .../explorer/pages/details.vue | 13 +- .../components/states/ready_to_merge.vue | 33 ++++- .../states/ready_to_merge.fragment.graphql | 2 + app/helpers/markup_helper.rb | 5 +- app/models/user.rb | 37 ++---- .../registry/repositories/index.html.haml | 1 + .../profiles/two_factor_auths/show.html.haml | 10 +- .../registry/repositories/index.html.haml | 1 + app/workers/all_queues.yml | 9 ++ .../quality/test_data_cleanup_worker.rb | 33 +++++ doc/administration/logs.md | 5 +- doc/api/group_wikis.md | 2 + doc/api/wikis.md | 2 + .../img/merge_request_reports_v14_7.png | Bin 0 -> 66876 bytes doc/development/img/merge_widget_v14_7.png | Bin 0 -> 56335 bytes .../merge_request_concepts/index.md | 62 ++++++++++ doc/user/packages/container_registry/index.md | 7 ++ .../merge_requests/commit_templates.md | 6 +- lib/api/entities/wiki_page.rb | 2 +- lib/api/helpers/wikis_helpers.rb | 4 +- lib/api/wikis.rb | 3 +- .../background_migration/batched_job.rb | 22 +++- locale/gitlab.pot | 6 + qa/qa/resource/project.rb | 12 ++ spec/factories/groups.rb | 9 ++ .../groups/container_registry_spec.rb | 2 + .../merge_request/user_sees_diff_spec.rb | 4 +- .../projects/container_registry_spec.rb | 2 + .../components/hidden_files_warning_spec.js | 18 +-- spec/frontend/fixtures/merge_requests.rb | 19 +++ .../ide/components/repo_editor_spec.js | 62 +++++++--- spec/frontend/lib/utils/common_utils_spec.js | 25 ---- spec/frontend/lib/utils/url_utility_spec.js | 53 +++++--- spec/frontend/merge_request_tabs_spec.js | 1 + .../details_page/delete_alert_spec.js | 21 ++++ .../container_registry/explorer/mock_data.js | 9 ++ .../explorer/pages/details_spec.js | 32 +++++ .../states/mr_widget_ready_to_merge_spec.js | 114 ++++++++++++++++-- spec/helpers/markup_helper_spec.rb | 5 +- spec/lib/api/entities/wiki_page_spec.rb | 14 +++ .../background_migration/batched_job_spec.rb | 92 ++++++++++++++ .../batched_migration_wrapper_spec.rb | 1 + spec/models/user_spec.rb | 64 +++++++++- spec/requests/api/wikis_spec.rb | 24 ++-- .../container_registry_shared_examples.rb | 17 +++ .../shared_examples/lib/wikis_api_examples.rb | 38 ++++++ .../quality/test_data_cleanup_worker_spec.rb | 44 +++++++ 55 files changed, 887 insertions(+), 187 deletions(-) create mode 100644 app/workers/quality/test_data_cleanup_worker.rb create mode 100644 doc/development/img/merge_request_reports_v14_7.png create mode 100644 doc/development/img/merge_widget_v14_7.png create mode 100644 doc/development/merge_request_concepts/index.md create mode 100644 spec/workers/quality/test_data_cleanup_worker_spec.rb diff --git a/.gitlab/ci/review-apps/qa.gitlab-ci.yml b/.gitlab/ci/review-apps/qa.gitlab-ci.yml index eaf6429ad58..d0234367e26 100644 --- a/.gitlab/ci/review-apps/qa.gitlab-ci.yml +++ b/.gitlab/ci/review-apps/qa.gitlab-ci.yml @@ -42,9 +42,6 @@ expire_in: 7 days when: always -.parallel-qa-base: - parallel: 5 - .allure-report-base: image: name: ${GITLAB_DEPENDENCY_PROXY}andrcuns/allure-report-publisher:0.4.2 @@ -82,7 +79,7 @@ review-qa-reliable: extends: - .review-qa-base - .review:rules:review-qa-reliable - - .parallel-qa-base + parallel: 8 retry: 1 variables: QA_RUN_TYPE: review-qa-reliable @@ -92,7 +89,7 @@ review-qa-all: extends: - .review-qa-base - .review:rules:review-qa-all - - .parallel-qa-base + parallel: 5 variables: QA_RUN_TYPE: review-qa-all QA_SCENARIO: Test::Instance::All diff --git a/app/assets/javascripts/diffs/components/hidden_files_warning.vue b/app/assets/javascripts/diffs/components/hidden_files_warning.vue index baf7471582a..b9962682848 100644 --- a/app/assets/javascripts/diffs/components/hidden_files_warning.vue +++ b/app/assets/javascripts/diffs/components/hidden_files_warning.vue @@ -1,6 +1,19 @@ diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue index 05493db1dff..f14d86114b8 100644 --- a/app/assets/javascripts/ide/components/repo_editor.vue +++ b/app/assets/javascripts/ide/components/repo_editor.vue @@ -147,6 +147,9 @@ export default { fileType() { return this.previewMode?.id || ''; }, + showTabs() { + return !this.shouldHideEditor && this.isEditModeActive && this.previewMode; + }, }, watch: { 'file.name': { @@ -194,6 +197,9 @@ export default { this.refreshEditorDimensions(); } }, + showTabs() { + this.$nextTick(() => this.refreshEditorDimensions()); + }, rightPaneIsOpen() { this.refreshEditorDimensions(); }, @@ -410,7 +416,7 @@ export default { } }, refreshEditorDimensions() { - if (this.showEditor) { + if (this.showEditor && this.editor) { this.editor.updateDimensions(); } }, @@ -495,7 +501,7 @@ export default {