From 7dd006b7ab8404228ebc78c0eb3fff7ca10d93f4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 31 May 2022 18:08:16 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../behaviors/markdown/render_math.js | 2 +- .../clusters_list/components/clusters.vue | 10 +-- .../extensions/source_editor_ci_schema_ext.js | 12 ++- app/assets/javascripts/editor/schema/ci.json | 78 ++++++++++++------ .../components/service_accounts_list.vue | 2 +- app/assets/javascripts/ide/utils.js | 3 +- .../jobs/components/manual_variables_form.vue | 2 +- .../jobs/components/table/jobs_table_app.vue | 2 +- .../labels/components/promote_label_modal.vue | 2 +- .../merge_conflict_resolver_app.vue | 2 +- .../components/dashboard_actions_menu.vue | 2 +- .../notes/components/diff_with_note.vue | 9 +- .../components/bulk_imports_history_app.vue | 2 +- .../components/import_error_details.vue | 2 +- .../history/components/import_history_app.vue | 2 +- .../permissions/components/settings_panel.vue | 49 +++++++++-- .../components/file_nav/branch_switcher.vue | 2 +- .../pipelines/components/jobs/jobs_app.vue | 2 +- .../pipelines/pipeline_details_bundle.js | 14 ++-- .../reports/components/summary_row.vue | 2 +- .../repository/components/last_commit.vue | 2 +- .../repository/components/preview/index.vue | 2 +- .../components/time_tracking/report.vue | 2 +- .../terraform/components/terraform_list.vue | 2 +- .../token_access/components/token_access.vue | 2 +- .../components/mr_widget_pipeline.vue | 2 +- .../components/mr_widget_status_icon.vue | 2 +- .../concerns/product_analytics_tracking.rb | 11 ++- .../projects/pipelines_controller.rb | 1 - .../projects/releases_controller.rb | 6 +- app/controllers/projects_controller.rb | 4 + app/controllers/search_controller.rb | 1 + .../readme_advanced.md.tt | 46 +++++++---- app/views/groups/edit.html.haml | 1 - .../groups/settings/ci_cd/show.html.haml | 1 - app/views/groups/show.html.haml | 1 - app/views/projects/activity.html.haml | 1 + app/views/projects/confluences/show.html.haml | 2 +- app/views/projects/jobs/index.html.haml | 2 - app/views/projects/labels/index.html.haml | 1 + .../mattermosts/_team_selection.html.haml | 2 +- .../pipeline_schedules/index.html.haml | 2 - .../projects/pipelines/_with_tabs.html.haml | 39 +-------- app/views/projects/pipelines/index.html.haml | 2 - .../projects/project_members/index.html.haml | 1 + .../projects/settings/ci_cd/show.html.haml | 2 - app/workers/all_queues.yml | 9 -- .../create_default_alerts_worker.rb | 19 ----- .../development/failed_jobs_tab_vue.yml | 8 -- .../remove_sha_from_releases_json.yml | 8 -- config/sidekiq_queues.yml | 2 - .../geo/disaster_recovery/index.md | 8 +- .../geo/secondary_proxy/index.md | 3 + doc/api/releases/index.md | 1 + doc/ci/troubleshooting.md | 29 ++++++- doc/install/installation.md | 2 +- doc/subscriptions/gitlab_com/index.md | 10 +-- .../milestones/burndown_and_burnup_charts.md | 6 +- .../img/burndown_and_burnup_charts_v13_6.png | Bin 55865 -> 0 bytes .../img/burndown_and_burnup_charts_v15_1.png | Bin 0 -> 34450 bytes .../milestones/img/burndown_chart_v13_6.png | Bin 48403 -> 0 bytes .../milestones/img/burndown_chart_v15_1.png | Bin 0 -> 20287 bytes .../milestones/img/burnup_chart_v13_6.png | Bin 29283 -> 0 bytes .../milestones/img/burnup_chart_v15_1.png | Bin 0 -> 21144 bytes doc/user/project/milestones/index.md | 2 +- lib/api/releases.rb | 3 +- locale/gitlab.pot | 49 +++++++---- qa/qa/runtime/namespace.rb | 2 +- qa/qa/tools/delete_projects.rb | 2 +- qa/qa/tools/delete_subgroups.rb | 2 +- qa/qa/tools/test_resources_handler.rb | 2 +- .../projects/releases_controller_spec.rb | 9 -- .../projects/pipelines/pipeline_spec.rb | 31 ------- .../clusters_list/components/clusters_spec.js | 19 ++--- spec/requests/api/releases_spec.rb | 16 ++++ spec/services/releases/create_service_spec.rb | 21 ++++- .../navbar_structure_context.rb | 4 +- spec/workers/every_sidekiq_worker_spec.rb | 1 - .../create_default_alerts_worker_spec.rb | 13 --- 79 files changed, 313 insertions(+), 309 deletions(-) delete mode 100644 app/workers/prometheus/create_default_alerts_worker.rb delete mode 100644 config/feature_flags/development/failed_jobs_tab_vue.yml delete mode 100644 config/feature_flags/development/remove_sha_from_releases_json.yml delete mode 100644 doc/user/project/milestones/img/burndown_and_burnup_charts_v13_6.png create mode 100644 doc/user/project/milestones/img/burndown_and_burnup_charts_v15_1.png delete mode 100644 doc/user/project/milestones/img/burndown_chart_v13_6.png create mode 100644 doc/user/project/milestones/img/burndown_chart_v15_1.png delete mode 100644 doc/user/project/milestones/img/burnup_chart_v13_6.png create mode 100644 doc/user/project/milestones/img/burnup_chart_v15_1.png delete mode 100644 spec/workers/prometheus/create_default_alerts_worker_spec.rb diff --git a/app/assets/javascripts/behaviors/markdown/render_math.js b/app/assets/javascripts/behaviors/markdown/render_math.js index e29c6e9b0ba..fd1a99acf99 100644 --- a/app/assets/javascripts/behaviors/markdown/render_math.js +++ b/app/assets/javascripts/behaviors/markdown/render_math.js @@ -81,7 +81,7 @@ class SafeMathRenderer { 'math|Displaying this math block may cause performance issues on this page', )}
- +