From c39912f5538caca913374a8983adffc234b3f1c9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 21 Jun 2022 15:09:33 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../agents/components/create_token_button.vue | 216 +--------- .../agents/components/create_token_modal.vue | 218 ++++++++++ .../agents/components/revoke_token_button.vue | 2 +- .../agents/components/token_table.vue | 100 ++--- app/models/clusters/applications/runner.rb | 2 +- app/models/deployment.rb | 20 +- .../integrations/project_test_data.rb | 2 +- app/views/errors/not_found.html.haml | 3 +- app/views/shared/members/_member.html.haml | 3 +- app/workers/deployments/hooks_worker.rb | 2 +- .../deployment_hooks_skip_worker.yml | 8 - .../gitaly_revlist_for_repo_size.yml | 8 + doc/api/graphql/reference/index.md | 5 +- doc/development/code_review.md | 4 +- doc/user/group/index.md | 13 + lib/gitlab/data_builder/deployment.rb | 9 +- locale/gitlab.pot | 2 +- qa/qa/git/repository.rb | 25 ++ qa/qa/resource/project.rb | 29 ++ .../gitlab_migration_large_project_spec.rb | 2 +- .../3_create/repository/storage_size_spec.rb | 77 ++++ qa/qa/support/run.rb | 4 + scripts/lib/glfm/update_example_snapshots.rb | 2 +- spec/features/admin/admin_groups_spec.rb | 24 +- spec/features/admin/admin_projects_spec.rb | 28 +- .../components/create_token_button_spec.js | 255 ++---------- .../components/create_token_modal_spec.js | 223 +++++++++++ .../agents/components/token_table_spec.js | 6 +- .../remark_markdown_processing_spec.js | 374 +++++++----------- .../gitlab/data_builder/deployment_spec.rb | 10 +- spec/models/ci/build_spec.rb | 22 +- spec/models/deployment_spec.rb | 117 +----- .../chat_message/deployment_message_spec.rb | 2 +- spec/models/integrations/slack_spec.rb | 2 +- spec/requests/api/markdown_snapshot_spec.rb | 1 + .../lib/glfm/update_example_snapshots_spec.rb | 2 +- .../deployments/create_service_spec.rb | 37 +- .../update_environment_service_spec.rb | 2 +- .../chat_integration_shared_examples.rb | 3 +- ...ack_mattermost_notifier_shared_examples.rb | 4 +- vendor/project_templates/rails.tar.gz | Bin 148742 -> 150831 bytes 41 files changed, 952 insertions(+), 916 deletions(-) create mode 100644 app/assets/javascripts/clusters/agents/components/create_token_modal.vue delete mode 100644 config/feature_flags/development/deployment_hooks_skip_worker.yml create mode 100644 config/feature_flags/undefined/gitaly_revlist_for_repo_size.yml create mode 100644 qa/qa/specs/features/api/3_create/repository/storage_size_spec.rb create mode 100644 spec/frontend/clusters/agents/components/create_token_modal_spec.js diff --git a/app/assets/javascripts/clusters/agents/components/create_token_button.vue b/app/assets/javascripts/clusters/agents/components/create_token_button.vue index 74155d7819a..67a178b5f98 100644 --- a/app/assets/javascripts/clusters/agents/components/create_token_button.vue +++ b/app/assets/javascripts/clusters/agents/components/create_token_button.vue @@ -1,154 +1,23 @@ @@ -170,82 +39,5 @@ export default { :title="$options.i18n.dropdownDisabledHint" /> - - - - {{ error }} - - - - - - - - diff --git a/app/assets/javascripts/clusters/agents/components/create_token_modal.vue b/app/assets/javascripts/clusters/agents/components/create_token_modal.vue new file mode 100644 index 00000000000..451e1ee1d67 --- /dev/null +++ b/app/assets/javascripts/clusters/agents/components/create_token_modal.vue @@ -0,0 +1,218 @@ + + + diff --git a/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue b/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue index 7d36cbb170d..f0af0da4bb4 100644 --- a/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue +++ b/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue @@ -148,7 +148,7 @@ export default { }, hideModal() { this.resetModal(); - this.$refs.modal.hide(); + this.$refs.modal?.hide(); }, }, }; diff --git a/app/assets/javascripts/clusters/agents/components/token_table.vue b/app/assets/javascripts/clusters/agents/components/token_table.vue index 9e64c9da712..f74d66f6b8f 100644 --- a/app/assets/javascripts/clusters/agents/components/token_table.vue +++ b/app/assets/javascripts/clusters/agents/components/token_table.vue @@ -3,6 +3,7 @@ import { GlEmptyState, GlTable, GlTooltip, GlTruncate } from '@gitlab/ui'; import { s__ } from '~/locale'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import CreateTokenButton from './create_token_button.vue'; +import CreateTokenModal from './create_token_modal.vue'; import RevokeTokenButton from './revoke_token_button.vue'; export default { @@ -13,6 +14,7 @@ export default { GlTruncate, TimeAgoTooltip, CreateTokenButton, + CreateTokenModal, RevokeTokenButton, }, i18n: { @@ -85,57 +87,57 @@ export default {