From eef3d92529e978c3cabafc321965569776c289b7 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 8 Jun 2022 21:08:52 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- Gemfile.lock | 2 +- .../components/recovery_codes.vue | 2 +- .../components/environment_form.vue | 2 +- .../components/environments_detail_header.vue | 2 +- .../components/feature_flags.vue | 5 +- .../components/new_feature_flag.vue | 2 +- .../groups/components/group_name_and_path.vue | 232 ++++++++++++++++ .../javascripts/groups/create_edit_form.js | 29 ++ .../ide/components/commit_sidebar/form.vue | 2 +- .../issues/show/components/title.vue | 2 +- .../jira_connect/branches/pages/index.vue | 2 +- .../components/jira_import_form.vue | 2 +- app/assets/javascripts/lib/utils/forms.js | 4 +- .../components/details/package_files.vue | 2 +- .../pages/admin/groups/edit/index.js | 2 + .../pages/admin/groups/new/index.js | 3 + .../javascripts/pages/groups/new/index.js | 5 +- .../show/components/issuable_title.vue | 2 +- .../stylesheets/framework/page_title.scss | 2 - .../stylesheets/framework/typography.scss | 2 - app/assets/stylesheets/pages/detail_page.scss | 1 - app/helpers/groups_helper.rb | 9 + app/views/abuse_reports/new.html.haml | 2 +- app/views/admin/abuse_reports/index.html.haml | 2 +- app/views/admin/applications/edit.html.haml | 2 +- app/views/admin/applications/index.html.haml | 2 +- app/views/admin/applications/new.html.haml | 2 +- app/views/admin/applications/show.html.haml | 2 +- .../admin/background_jobs/show.html.haml | 2 +- .../admin/broadcast_messages/index.html.haml | 2 +- app/views/admin/deploy_keys/edit.html.haml | 2 +- app/views/admin/deploy_keys/new.html.haml | 2 +- .../admin/gitaly_servers/index.html.haml | 2 +- app/views/admin/groups/edit.html.haml | 2 +- app/views/admin/groups/new.html.haml | 2 +- app/views/admin/groups/show.html.haml | 2 +- app/views/admin/health_check/show.html.haml | 2 +- app/views/admin/hook_logs/show.html.haml | 2 +- app/views/admin/identities/edit.html.haml | 2 +- app/views/admin/identities/new.html.haml | 2 +- app/views/admin/labels/edit.html.haml | 2 +- app/views/admin/labels/index.html.haml | 2 +- app/views/admin/labels/new.html.haml | 2 +- app/views/admin/projects/show.html.haml | 2 +- app/views/admin/spam_logs/index.html.haml | 2 +- app/views/admin/topics/edit.html.haml | 2 +- app/views/admin/topics/new.html.haml | 2 +- app/views/admin/users/_head.html.haml | 2 +- app/views/admin/users/edit.html.haml | 2 +- app/views/admin/users/new.html.haml | 2 +- app/views/dashboard/_activity_head.html.haml | 2 +- app/views/dashboard/_groups_head.html.haml | 2 +- app/views/dashboard/_projects_head.html.haml | 2 +- app/views/dashboard/_snippets_head.html.haml | 2 +- app/views/dashboard/issues.html.haml | 2 +- app/views/dashboard/merge_requests.html.haml | 2 +- .../dashboard/milestones/index.html.haml | 2 +- app/views/dashboard/todos/index.html.haml | 2 +- .../doorkeeper/applications/edit.html.haml | 2 +- .../doorkeeper/applications/new.html.haml | 2 +- .../doorkeeper/applications/show.html.haml | 2 +- .../doorkeeper/authorizations/error.html.haml | 2 +- .../authorizations/redirect.html.haml | 2 +- .../doorkeeper/authorizations/show.html.haml | 2 +- app/views/explore/topics/_head.html.haml | 2 +- app/views/groups/labels/edit.html.haml | 2 +- app/views/groups/labels/new.html.haml | 2 +- app/views/groups/milestones/edit.html.haml | 2 +- app/views/groups/milestones/new.html.haml | 2 +- app/views/groups/runners/edit.html.haml | 2 +- .../settings/applications/edit.html.haml | 2 +- .../settings/applications/show.html.haml | 2 +- app/views/import/bitbucket/status.html.haml | 2 +- .../import/bitbucket_server/new.html.haml | 2 +- .../import/bitbucket_server/status.html.haml | 2 +- app/views/import/fogbugz/new.html.haml | 2 +- .../import/fogbugz/new_user_map.html.haml | 2 +- app/views/import/fogbugz/status.html.haml | 2 +- app/views/import/gitea/new.html.haml | 2 +- app/views/import/gitea/status.html.haml | 2 +- app/views/import/github/new.html.haml | 2 +- app/views/import/github/status.html.haml | 2 +- app/views/import/gitlab/status.html.haml | 2 +- .../import/gitlab_projects/new.html.haml | 2 +- app/views/import/manifest/new.html.haml | 2 +- app/views/import/manifest/status.html.haml | 2 +- app/views/import/phabricator/new.html.haml | 2 +- app/views/invites/show.html.haml | 2 +- app/views/profiles/chat_names/new.html.haml | 2 +- app/views/profiles/passwords/new.html.haml | 2 +- .../projects/_visibility_modal.html.haml | 2 +- app/views/projects/blob/_new_dir.html.haml | 2 +- app/views/projects/blob/_remove.html.haml | 2 +- app/views/projects/blob/_upload.html.haml | 2 +- app/views/projects/blob/edit.html.haml | 2 +- app/views/projects/blob/new.html.haml | 2 +- app/views/projects/branches/new.html.haml | 2 +- app/views/projects/compare/index.html.haml | 2 +- app/views/projects/deploy_keys/edit.html.haml | 2 +- .../projects/environments/terminal.html.haml | 2 +- app/views/projects/hook_logs/show.html.haml | 2 +- app/views/projects/imports/new.html.haml | 2 +- app/views/projects/issues/edit.html.haml | 2 +- app/views/projects/issues/new.html.haml | 2 +- app/views/projects/labels/edit.html.haml | 2 +- app/views/projects/labels/new.html.haml | 2 +- .../merge_requests/_mr_title.html.haml | 2 +- .../creations/_new_compare.html.haml | 2 +- .../creations/_new_submit.html.haml | 2 +- .../projects/merge_requests/edit.html.haml | 2 +- app/views/projects/milestones/edit.html.haml | 2 +- app/views/projects/milestones/new.html.haml | 2 +- app/views/projects/new.html.haml | 2 +- app/views/projects/pages/show.html.haml | 2 +- .../projects/pages_domains/new.html.haml | 2 +- .../projects/pages_domains/show.html.haml | 2 +- .../pipeline_schedules/edit.html.haml | 2 +- .../projects/pipeline_schedules/new.html.haml | 2 +- app/views/projects/pipelines/new.html.haml | 2 +- app/views/projects/runners/edit.html.haml | 2 +- app/views/projects/snippets/edit.html.haml | 2 +- app/views/projects/snippets/new.html.haml | 2 +- app/views/projects/tags/new.html.haml | 2 +- app/views/projects/tracings/show.html.haml | 2 +- .../projects/usage_quotas/index.html.haml | 2 +- app/views/search/show.html.haml | 2 +- .../sent_notifications/unsubscribe.html.haml | 2 +- app/views/shared/_captcha_check.html.haml | 2 +- app/views/shared/_group_form.html.haml | 78 +++--- .../_group_name_and_path_fields.html.haml | 4 + .../shared/integrations/overrides.html.haml | 2 +- .../shared/runners/_runner_details.html.haml | 2 +- app/views/shared/wikis/diff.html.haml | 2 +- app/views/shared/wikis/edit.html.haml | 2 +- app/views/shared/wikis/history.html.haml | 2 +- app/views/shared/wikis/pages.html.haml | 2 +- app/views/snippets/edit.html.haml | 2 +- app/views/snippets/new.html.haml | 2 +- app/views/users/unsubscribes/show.html.haml | 2 +- .../development/group_name_path_vue.yml | 8 + ...se_received_header_for_incoming_emails.yml | 8 - doc/administration/incoming_email.md | 3 +- .../reference_architectures/10k_users.md | 10 +- .../reference_architectures/25k_users.md | 10 +- .../reference_architectures/3k_users.md | 10 +- .../reference_architectures/50k_users.md | 10 +- .../reference_architectures/5k_users.md | 10 +- doc/ci/yaml/index.md | 6 +- .../dependency_scanning/index.md | 1 + lib/gitlab/email/receiver.rb | 2 - qa/Gemfile.lock | 2 +- qa/qa/page/component/access_tokens.rb | 10 +- qa/qa/page/component/snippet.rb | 9 +- qa/qa/page/group/show.rb | 6 +- qa/qa/page/profile/emails.rb | 9 +- qa/qa/page/project/branches/show.rb | 7 +- qa/qa/page/project/settings/access_tokens.rb | 1 + qa/qa/page/project/settings/advanced.rb | 12 +- .../project/project_access_token_spec.rb | 14 +- .../add_list_delete_branches_spec.rb | 7 +- .../snippet/add_comment_to_snippet_spec.rb | 6 +- .../copy_snippet_file_contents_spec.rb | 6 +- qa/qa/support/page_error_checker.rb | 40 +-- scripts/license-check.sh | 32 +++ scripts/static-analysis | 2 +- scripts/utils.sh | 2 +- spec/features/admin/admin_groups_spec.rb | 12 +- spec/features/projects/new_project_spec.rb | 27 ++ .../components/group_name_and_path_spec.js | 261 ++++++++++++++++++ spec/frontend/lib/utils/forms_spec.js | 4 +- .../components/details/package_files_spec.js | 6 +- .../show/components/issuable_title_spec.js | 2 +- spec/helpers/groups_helper_spec.rb | 27 ++ spec/lib/gitlab/email/receiver_spec.rb | 12 +- 174 files changed, 945 insertions(+), 277 deletions(-) create mode 100644 app/assets/javascripts/groups/components/group_name_and_path.vue create mode 100644 app/assets/javascripts/groups/create_edit_form.js create mode 100644 app/views/shared/groups/_group_name_and_path_fields.html.haml create mode 100644 config/feature_flags/development/group_name_path_vue.yml delete mode 100644 config/feature_flags/development/use_received_header_for_incoming_emails.yml create mode 100755 scripts/license-check.sh create mode 100644 spec/frontend/groups/components/group_name_and_path_spec.js diff --git a/Gemfile.lock b/Gemfile.lock index c8550b6c697..53e8c321d22 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1736,4 +1736,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.1) BUNDLED WITH - 2.3.6 + 2.3.15 diff --git a/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue b/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue index 6a2e5f5c2c5..9cf41750efe 100644 --- a/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue +++ b/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue @@ -101,7 +101,7 @@ export default {