From 01600ff2d11bb7f77bb70bf143a95efdf59931e1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 1 Nov 2021 06:09:58 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/manage_two_factor_form.vue | 133 +++++++++++---- .../testing_guide/end_to_end/index.md | 2 +- .../testing_guide/end_to_end/style_guide.md | 10 +- .../testing_guide/testing_migrations_guide.md | 2 +- doc/development/uploads.md | 28 ++-- doc/index.md | 6 + .../dependency_scanning/index.md | 6 + .../getting_started/pages_ci_cd_template.md | 22 +-- .../pages/img/choose_ci_template_v13_1.png | Bin 10343 -> 0 bytes doc/user/project/pages/img/setup_ci_v13_1.png | Bin 15480 -> 0 bytes locale/gitlab.pot | 15 +- .../profiles/two_factor_auths_spec.rb | 12 +- .../components/manage_two_factor_form_spec.js | 156 +++++++++++------- .../hook/smime_signature_interceptor_spec.rb | 2 +- spec/tasks/gitlab/db_rake_spec.rb | 24 +-- spec/workers/emails_on_push_worker_spec.rb | 2 +- 16 files changed, 269 insertions(+), 151 deletions(-) delete mode 100644 doc/user/project/pages/img/choose_ci_template_v13_1.png delete mode 100644 doc/user/project/pages/img/setup_ci_v13_1.png diff --git a/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue b/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue index 0b748f18cb2..484c6524d0e 100644 --- a/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue +++ b/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue @@ -1,26 +1,46 @@