From e46506bcc32de1af076ec8a5d51d405f827dd986 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 11 Mar 2022 15:07:48 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- Gemfile | 2 +- Gemfile.lock | 4 +- .../components/delete_application.vue | 84 +++++++++++++++++++ .../javascripts/admin/applications/index.js | 15 ++++ .../pages/admin/applications/index.js | 3 + .../components/constants.js | 14 ++-- .../assignees/uncollapsed_assignee_list.vue | 2 +- .../components/attention_requested_toggle.vue | 23 +++-- .../reviewers/uncollapsed_reviewer_list.vue | 2 +- app/models/repository.rb | 4 +- app/models/snippet.rb | 2 +- .../admin/applications/_delete_form.html.haml | 9 +- app/views/admin/applications/index.html.haml | 2 + doc/api/graphql/reference/index.md | 4 +- .../database/database_reviewer_guidelines.md | 8 +- doc/development/experiment_guide/index.md | 12 +++ .../coverage_fuzzing/index.md | 8 +- lib/gitlab/git/repository.rb | 4 +- .../gitaly_client/repository_service.rb | 4 +- locale/gitlab.pot | 12 +++ package.json | 2 +- .../delete_application_spec.js.snap | 20 +++++ .../components/delete_application_spec.js | 69 +++++++++++++++ .../attention_requested_toggle_spec.js | 62 +++++++++++--- .../backfill_snippet_repositories_spec.rb | 12 +++ .../gitaly_client/repository_service_spec.rb | 20 +++++ spec/models/repository_spec.rb | 8 ++ spec/models/snippet_spec.rb | 27 +++--- .../security/configuration_presenter_spec.rb | 2 - .../manage_applications_shared_examples.rb | 2 +- yarn.lock | 18 ++-- 31 files changed, 372 insertions(+), 88 deletions(-) create mode 100644 app/assets/javascripts/admin/applications/components/delete_application.vue create mode 100644 app/assets/javascripts/admin/applications/index.js create mode 100644 app/assets/javascripts/pages/admin/applications/index.js create mode 100644 spec/frontend/admin/applications/components/__snapshots__/delete_application_spec.js.snap create mode 100644 spec/frontend/admin/applications/components/delete_application_spec.js diff --git a/Gemfile b/Gemfile index 64e5ea8bcce..5e7b3738185 100644 --- a/Gemfile +++ b/Gemfile @@ -479,7 +479,7 @@ gem 'ssh_data', '~> 1.2' gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.9.0.pre.rc2' +gem 'gitaly', '~> 14.9.0.pre.rc3' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' diff --git a/Gemfile.lock b/Gemfile.lock index 6fe4cdc9726..d2e2d1e6438 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -455,7 +455,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.9.0.pre.rc2) + gitaly (14.9.0.pre.rc3) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -1486,7 +1486,7 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.9.0.pre.rc2) + gitaly (~> 14.9.0.pre.rc3) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) gitlab-dangerfiles (~> 2.10.2) diff --git a/app/assets/javascripts/admin/applications/components/delete_application.vue b/app/assets/javascripts/admin/applications/components/delete_application.vue new file mode 100644 index 00000000000..77694296b0a --- /dev/null +++ b/app/assets/javascripts/admin/applications/components/delete_application.vue @@ -0,0 +1,84 @@ + + diff --git a/app/assets/javascripts/admin/applications/index.js b/app/assets/javascripts/admin/applications/index.js new file mode 100644 index 00000000000..5875fd18729 --- /dev/null +++ b/app/assets/javascripts/admin/applications/index.js @@ -0,0 +1,15 @@ +import Vue from 'vue'; +import DeleteApplication from './components/delete_application.vue'; + +export default () => { + const el = document.querySelector('.js-application-delete-modal'); + + if (!el) return false; + + return new Vue({ + el, + render(h) { + return h(DeleteApplication); + }, + }); +}; diff --git a/app/assets/javascripts/pages/admin/applications/index.js b/app/assets/javascripts/pages/admin/applications/index.js new file mode 100644 index 00000000000..3397b02aeba --- /dev/null +++ b/app/assets/javascripts/pages/admin/applications/index.js @@ -0,0 +1,3 @@ +import initApplicationDeleteButtons from '~/admin/applications'; + +initApplicationDeleteButtons(); diff --git a/app/assets/javascripts/security_configuration/components/constants.js b/app/assets/javascripts/security_configuration/components/constants.js index 11e092d8eb4..3def5e9d6b7 100644 --- a/app/assets/javascripts/security_configuration/components/constants.js +++ b/app/assets/javascripts/security_configuration/components/constants.js @@ -222,14 +222,12 @@ export const securityFeatures = [ helpPath: COVERAGE_FUZZING_HELP_PATH, configurationHelpPath: COVERAGE_FUZZING_CONFIG_HELP_PATH, type: REPORT_TYPE_COVERAGE_FUZZING, - secondary: gon?.features?.corpusManagementUi - ? { - type: REPORT_TYPE_CORPUS_MANAGEMENT, - name: CORPUS_MANAGEMENT_NAME, - description: CORPUS_MANAGEMENT_DESCRIPTION, - configurationText: CORPUS_MANAGEMENT_CONFIG_TEXT, - } - : {}, + secondary: { + type: REPORT_TYPE_CORPUS_MANAGEMENT, + name: CORPUS_MANAGEMENT_NAME, + description: CORPUS_MANAGEMENT_DESCRIPTION, + configurationText: CORPUS_MANAGEMENT_CONFIG_TEXT, + }, }, ]; diff --git a/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue b/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue index a27dbee31ec..558fe8ca2aa 100644 --- a/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue +++ b/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue @@ -114,7 +114,7 @@ export default { class="gl-display-inline-block" >