From 89245154567c6ea01821606f3127bef766462d5e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 30 Mar 2022 21:09:29 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/frontend.gitlab-ci.yml | 8 +- Gemfile.lock | 2 +- .../javascripts/persistent_user_callouts.js | 1 + .../admin_runners/admin_runners_app.vue | 24 +++- .../javascripts/runner/admin_runners/index.js | 8 +- .../runner/components/runner_bulk_delete.vue | 111 ++++++++++++++++ .../runner/components/runner_list.vue | 76 +++++++++-- .../list/checked_runner_ids.query.graphql | 3 + .../runner/graphql/list/local_state.js | 63 ++++++++++ .../runner/graphql/list/typedefs.graphql | 3 + app/assets/javascripts/runner/utils.js | 3 +- .../security_configuration/components/app.vue | 8 +- .../security_configuration/index.js | 2 + .../vue_shared/components/help_popover.vue | 2 +- app/controllers/admin/runners_controller.rb | 3 + .../projects/security/configuration_helper.rb | 4 + app/helpers/users/group_callouts_helper.rb | 2 + app/models/users/group_callout.rb | 3 +- app/presenters/issue_presenter.rb | 16 ++- .../groups/group_members/index.html.haml | 2 + app/views/groups/show.html.haml | 1 + app/views/layouts/_page.html.haml | 1 + app/views/projects/empty.html.haml | 1 + app/views/projects/no_repo.html.haml | 2 + .../projects/project_members/index.html.haml | 2 + .../security/configuration/show.html.haml | 1 + app/views/projects/show.html.haml | 1 + .../development/admin_runners_bulk_delete.yml | 8 ++ data/removals/15_0/15-0-rerequest-review.yml | 16 +++ doc/.vale/gitlab/Wordy.yml | 1 + doc/install/installation.md | 8 +- .../img/incident_list_v13_5.png | Bin 43685 -> 0 bytes doc/operations/metrics/dashboards/default.md | 2 +- doc/operations/metrics/dashboards/develop.md | 2 +- doc/operations/metrics/dashboards/index.md | 2 +- .../metrics/dashboards/panel_types.md | 2 +- doc/operations/metrics/dashboards/settings.md | 2 +- .../dashboards/templating_variables.md | 2 +- .../metrics/dashboards/variables.md | 2 +- doc/operations/metrics/dashboards/yaml.md | 2 +- doc/update/removals.md | 6 + .../img/vsa_filter_bar_v13_12.png | Bin 36706 -> 0 bytes .../img/vsa_overview_stage_v13_11.png | Bin 21148 -> 0 bytes .../img/vsa_path_nav_v13_11.png | Bin 22421 -> 0 bytes .../img/vsa_stage_table_v14_7.png | Bin 79595 -> 0 bytes .../img/vsa_time_metrics_v13_12.png | Bin 18354 -> 0 bytes doc/user/permissions.md | 2 +- .../deploy_keys/img/deploy_keys_v13_0.png | Bin 27295 -> 0 bytes .../prometheus_library/cloudwatch.md | 2 +- .../prometheus_library/haproxy.md | 2 +- .../integrations/prometheus_library/index.md | 2 +- .../prometheus_library/kubernetes.md | 2 +- .../integrations/prometheus_library/nginx.md | 2 +- .../prometheus_library/nginx_ingress.md | 2 +- .../prometheus_library/nginx_ingress_vts.md | 2 +- .../project/merge_requests/reviews/index.md | 8 +- locale/gitlab.pot | 41 ++++++ qa/qa/tools/test_resources_handler.rb | 7 +- spec/factories/issues.rb | 5 + spec/factories/work_items/work_item_types.rb | 5 + .../grouped_codequality_reports_app_spec.js | 4 +- .../admin_runners/admin_runners_app_spec.js | 64 ++++++++-- .../components/runner_bulk_delete_spec.js | 103 +++++++++++++++ .../runner/components/runner_list_spec.js | 31 ++++- .../runner/graphql/local_state_spec.js | 72 +++++++++++ spec/frontend/runner/utils_spec.js | 4 + .../components/app_spec.js | 6 +- .../components/help_popover_spec.js | 2 +- .../security/configuration_helper_spec.rb | 6 + spec/presenters/issue_presenter_spec.rb | 61 +++++++-- spec/views/groups/show.html.haml_spec.rb | 118 ------------------ 71 files changed, 769 insertions(+), 192 deletions(-) create mode 100644 app/assets/javascripts/runner/components/runner_bulk_delete.vue create mode 100644 app/assets/javascripts/runner/graphql/list/checked_runner_ids.query.graphql create mode 100644 app/assets/javascripts/runner/graphql/list/local_state.js create mode 100644 app/assets/javascripts/runner/graphql/list/typedefs.graphql create mode 100644 config/feature_flags/development/admin_runners_bulk_delete.yml create mode 100644 data/removals/15_0/15-0-rerequest-review.yml delete mode 100644 doc/operations/incident_management/img/incident_list_v13_5.png delete mode 100644 doc/user/group/value_stream_analytics/img/vsa_filter_bar_v13_12.png delete mode 100644 doc/user/group/value_stream_analytics/img/vsa_overview_stage_v13_11.png delete mode 100644 doc/user/group/value_stream_analytics/img/vsa_path_nav_v13_11.png delete mode 100644 doc/user/group/value_stream_analytics/img/vsa_stage_table_v14_7.png delete mode 100644 doc/user/group/value_stream_analytics/img/vsa_time_metrics_v13_12.png delete mode 100644 doc/user/project/deploy_keys/img/deploy_keys_v13_0.png create mode 100644 spec/frontend/runner/components/runner_bulk_delete_spec.js create mode 100644 spec/frontend/runner/graphql/local_state_spec.js delete mode 100644 spec/views/groups/show.html.haml_spec.rb diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 5d4521b3f36..6e84d4f3914 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -293,14 +293,14 @@ coverage-frontend: - *yarn-install - run_timed_command "retry yarn run webpack-prod" -qa-frontend-node:12: - extends: .qa-frontend-node - image: ${GITLAB_DEPENDENCY_PROXY}node:12 - qa-frontend-node:14: extends: .qa-frontend-node image: ${GITLAB_DEPENDENCY_PROXY}node:14 +qa-frontend-node:16: + extends: .qa-frontend-node + image: ${GITLAB_DEPENDENCY_PROXY}node:16 + qa-frontend-node:latest: extends: - .qa-frontend-node diff --git a/Gemfile.lock b/Gemfile.lock index c4b952d8216..7fc00cd0004 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1252,7 +1252,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) + sqlite3 (1.4.2) ssh_data (1.2.0) ssrf_filter (1.0.7) stackprof (0.2.15) diff --git a/app/assets/javascripts/persistent_user_callouts.js b/app/assets/javascripts/persistent_user_callouts.js index f6de21ec0c5..dee832c01d5 100644 --- a/app/assets/javascripts/persistent_user_callouts.js +++ b/app/assets/javascripts/persistent_user_callouts.js @@ -12,6 +12,7 @@ const PERSISTENT_USER_CALLOUTS = [ '.js-security-newsletter-callout', '.js-approaching-seats-count-threshold', '.js-storage-enforcement-banner', + '.js-user-over-limit-free-plan-alert', ]; const initCallouts = () => { diff --git a/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue b/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue index 9abd45424e7..3853a7d8666 100644 --- a/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue +++ b/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue @@ -4,9 +4,11 @@ import { createAlert } from '~/flash'; import { updateHistory } from '~/lib/utils/url_utility'; import { formatNumber } from '~/locale'; import { fetchPolicies } from '~/lib/graphql'; +import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import RegistrationDropdown from '../components/registration/registration_dropdown.vue'; import RunnerFilteredSearchBar from '../components/runner_filtered_search_bar.vue'; +import RunnerBulkDelete from '../components/runner_bulk_delete.vue'; import RunnerList from '../components/runner_list.vue'; import RunnerName from '../components/runner_name.vue'; import RunnerStats from '../components/stat/runner_stats.vue'; @@ -53,6 +55,7 @@ export default { GlLink, RegistrationDropdown, RunnerFilteredSearchBar, + RunnerBulkDelete, RunnerList, RunnerName, RunnerStats, @@ -60,6 +63,8 @@ export default { RunnerTypeTabs, RunnerActionsCell, }, + mixins: [glFeatureFlagMixin()], + inject: ['localMutations'], props: { registrationToken: { type: String, @@ -180,6 +185,11 @@ export default { }, ]; }, + isBulkDeleteEnabled() { + // Feature flag: admin_runners_bulk_delete + // Rollout issue: https://gitlab.com/gitlab-org/gitlab/-/issues/353981 + return this.glFeatures.adminRunnersBulkDelete; + }, }, watch: { search: { @@ -238,6 +248,12 @@ export default { reportToSentry(error) { captureException({ error, component: this.$options.name }); }, + onChecked({ runner, isChecked }) { + this.localMutations.setRunnerChecked({ + runner, + isChecked, + }); + }, }, filteredSearchNamespace: ADMIN_FILTERED_SEARCH_NAMESPACE, INSTANCE_TYPE, @@ -286,7 +302,13 @@ export default { {{ __('No runners found') }}