From d50aece8c29b9dd36346a4d9bdf2250324c5f62a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 22 Oct 2021 18:13:20 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../pipelines_list/pipeline_multi_actions.vue | 4 +- .../pipelines_list/pipelines_artifacts.vue | 9 +- .../projects/default_project_templates.js | 4 + .../admin_runners/admin_runners_app.vue | 18 +- .../javascripts/runner/admin_runners/index.js | 2 + .../components/helpers/masked_value.vue | 60 ------- .../registration/registration_dropdown.vue | 103 +++++++++++ .../registration/registration_token.vue | 83 +++++++++ ...egistration_token_reset_dropdown_item.vue} | 19 +- .../components/runner_manual_setup_help.vue | 108 ----------- .../group_runners/group_runners_app.vue | 13 +- .../runner_instructions_modal.vue | 8 +- app/views/projects/hook_logs/show.html.haml | 14 +- app/views/shared/hook_logs/_content.html.haml | 59 +++--- data/whats_new/2021102000001_14_04.yml | 60 +++++++ doc/install/aws/gitlab_hybrid_on_aws.md | 103 ++++++----- doc/install/aws/gitlab_sre_for_aws.md | 6 - doc/install/aws/index.md | 36 ++-- doc/user/clusters/agent/ci_cd_tunnel.md | 3 +- doc/user/clusters/agent/index.md | 9 +- doc/user/clusters/agent/install/index.md | 4 +- doc/user/clusters/agent/repository.md | 11 +- doc/user/permissions.md | 4 +- lib/gitlab/project_template.rb | 1 + locale/gitlab.pot | 48 ++++- locale/zh_CN/gitlab.po | 6 + locale/zh_HK/gitlab.po | 6 + locale/zh_TW/gitlab.po | 6 + spec/features/admin/admin_runners_spec.rb | 38 +++- .../admin_runners/admin_runners_app_spec.js | 7 +- .../components/helpers/masked_value_spec.js | 51 ------ .../registration_dropdown_spec.js | 169 ++++++++++++++++++ ...tration_token_reset_dropdown_item_spec.js} | 45 ++--- .../registration/registration_token_spec.js | 109 +++++++++++ .../runner_manual_setup_help_spec.js | 122 ------------- .../group_runners/group_runners_app_spec.js | 8 +- .../runner_instructions_modal_spec.js | 37 +++- spec/lib/gitlab/project_template_spec.rb | 4 +- .../tencent_serverless_framework.tar.gz | Bin 0 -> 119482 bytes 39 files changed, 878 insertions(+), 519 deletions(-) delete mode 100644 app/assets/javascripts/runner/components/helpers/masked_value.vue create mode 100644 app/assets/javascripts/runner/components/registration/registration_dropdown.vue create mode 100644 app/assets/javascripts/runner/components/registration/registration_token.vue rename app/assets/javascripts/runner/components/{runner_registration_token_reset.vue => registration/registration_token_reset_dropdown_item.vue} (86%) delete mode 100644 app/assets/javascripts/runner/components/runner_manual_setup_help.vue create mode 100644 data/whats_new/2021102000001_14_04.yml delete mode 100644 spec/frontend/runner/components/helpers/masked_value_spec.js create mode 100644 spec/frontend/runner/components/registration/registration_dropdown_spec.js rename spec/frontend/runner/components/{runner_registration_token_reset_spec.js => registration/registration_token_reset_dropdown_item_spec.js} (80%) create mode 100644 spec/frontend/runner/components/registration/registration_token_spec.js delete mode 100644 spec/frontend/runner/components/runner_manual_setup_help_spec.js create mode 100644 vendor/project_templates/tencent_serverless_framework.tar.gz diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_multi_actions.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_multi_actions.vue index b778fe28e59..9725e882d5e 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_multi_actions.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_multi_actions.vue @@ -95,9 +95,9 @@ export default { {{ $options.i18n.artifactsFetchErrorMessage }} - + - + {{ $options.i18n.emptyArtifactsMessage }} diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_artifacts.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_artifacts.vue index 1c7c4d7c704..6728f2875a4 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_artifacts.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_artifacts.vue @@ -50,11 +50,6 @@ export default { isLoading: false, }; }, - computed: { - hasArtifacts() { - return Boolean(this.artifacts.length); - }, - }, methods: { fetchArtifacts() { this.isLoading = true; @@ -99,9 +94,9 @@ export default { {{ $options.i18n.artifactsFetchErrorMessage }} - + - + {{ $options.i18n.noArtifacts }} diff --git a/app/assets/javascripts/projects/default_project_templates.js b/app/assets/javascripts/projects/default_project_templates.js index 2da9449d24e..0393d82ca36 100644 --- a/app/assets/javascripts/projects/default_project_templates.js +++ b/app/assets/javascripts/projects/default_project_templates.js @@ -93,6 +93,10 @@ export default { text: s__('ProjectTemplates|Serverless Framework/JS'), icon: '.template-option .icon-serverless_framework', }, + tencent_serverless_framework: { + text: s__('ProjectTemplates|Tencent Serverless Framework/NextjsSSR'), + icon: '.template-option .icon-tencent_serverless_framework', + }, cluster_management: { text: s__('ProjectTemplates|GitLab Cluster Management'), icon: '.template-option .icon-cluster_management', 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 c8513a0b803..e278cfec804 100644 --- a/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue +++ b/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue @@ -4,11 +4,13 @@ import createFlash from '~/flash'; import { fetchPolicies } from '~/lib/graphql'; import { updateHistory } from '~/lib/utils/url_utility'; import { formatNumber, sprintf, __ } from '~/locale'; + +import RegistrationDropdown from '../components/registration/registration_dropdown.vue'; import RunnerFilteredSearchBar from '../components/runner_filtered_search_bar.vue'; import RunnerList from '../components/runner_list.vue'; -import RunnerManualSetupHelp from '../components/runner_manual_setup_help.vue'; import RunnerName from '../components/runner_name.vue'; import RunnerPagination from '../components/runner_pagination.vue'; + import { statusTokenConfig } from '../components/search_tokens/status_token_config'; import { tagTokenConfig } from '../components/search_tokens/tag_token_config'; import { typeTokenConfig } from '../components/search_tokens/type_token_config'; @@ -25,9 +27,9 @@ export default { name: 'AdminRunnersApp', components: { GlLink, + RegistrationDropdown, RunnerFilteredSearchBar, RunnerList, - RunnerManualSetupHelp, RunnerName, RunnerPagination, }, @@ -126,10 +128,14 @@ export default {