Add latest changes from gitlab-org/gitlab@master

11 files changed, 11 insertions, 13 deletions

diff --git a/app/views/admin/application_settings/_git_lfs_limits.html.haml b/app/views/admin/application_settings/_git_lfs_limits.html.haml
index 638984ae97a..bac781675e2 100644
--- a/app/views/admin/application_settings/_git_lfs_limits.html.haml
+++ b/app/views/admin/application_settings/_git_lfs_limits.html.haml
@@ -15,4 +15,4 @@
       = f.label :throttle_authenticated_git_lfs_period_in_seconds, _('Authenticated Git LFS rate limit period in seconds'), class: 'gl-font-weight-bold'
       = f.number_field :throttle_authenticated_git_lfs_period_in_seconds, class: 'form-control gl-form-input'
 
-  = f.submit _('Save changes'), pajamas_button: true, data: { qa_selector: 'save_changes_button' }
+  = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/application_settings/_import_export_limits.html.haml b/app/views/admin/application_settings/_import_export_limits.html.haml
index 269a1497324..9e6f4bbd6a0 100644
--- a/app/views/admin/application_settings/_import_export_limits.html.haml
+++ b/app/views/admin/application_settings/_import_export_limits.html.haml
@@ -34,4 +34,4 @@
       = f.label :group_download_export_limit, _('Maximum group export download requests per minute'), class: 'label-bold'
       = f.number_field :group_download_export_limit, class: 'form-control gl-form-input'
 
-  = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true
+  = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/application_settings/_issue_limits.html.haml b/app/views/admin/application_settings/_issue_limits.html.haml
index 147aab443b2..e78c0209737 100644
--- a/app/views/admin/application_settings/_issue_limits.html.haml
+++ b/app/views/admin/application_settings/_issue_limits.html.haml
@@ -6,4 +6,4 @@
       = f.label :issues_create_limit, _('Maximum number of requests per minute')
       = f.number_field :issues_create_limit, class: 'form-control gl-form-input'
 
-  = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true
+  = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/application_settings/_network_rate_limits.html.haml b/app/views/admin/application_settings/_network_rate_limits.html.haml
index 300180f7b9a..1a45cbd33cf 100644
--- a/app/views/admin/application_settings/_network_rate_limits.html.haml
+++ b/app/views/admin/application_settings/_network_rate_limits.html.haml
@@ -8,7 +8,6 @@
     .form-group
       = f.gitlab_ui_checkbox_component :"throttle_unauthenticated_#{setting_fragment}_enabled",
         _('Enable unauthenticated API request rate limit'),
-        checkbox_options: { data: { qa_selector: "throttle_unauthenticated_#{setting_fragment}_checkbox" } },
         label_options: { class: 'label-bold' }
     .form-group
       = f.label :"throttle_unauthenticated_#{setting_fragment}_requests_per_period", _('Maximum unauthenticated API requests per rate limit period per IP'), class: 'label-bold'
@@ -21,7 +20,6 @@
     .form-group
       = f.gitlab_ui_checkbox_component :"throttle_authenticated_#{setting_fragment}_enabled",
         _('Enable authenticated API request rate limit'),
-        checkbox_options: { data: { qa_selector: "throttle_authenticated_#{setting_fragment}_checkbox" } },
         label_options: { class: 'label-bold' }
     .form-group
       = f.label :"throttle_authenticated_#{setting_fragment}_requests_per_period", _('Maximum authenticated API requests per rate limit period per user'), class: 'label-bold'
@@ -30,4 +28,4 @@
       = f.label :"throttle_authenticated_#{setting_fragment}_period_in_seconds", _('Authenticated API rate limit period in seconds'), class: 'label-bold'
       = f.number_field :"throttle_authenticated_#{setting_fragment}_period_in_seconds", class: 'form-control gl-form-input'
 
-  = f.submit _('Save changes'), pajamas_button: true, data: { qa_selector: 'save_changes_button' }
+  = f.submit _('Save changes'), pajamas_button: true, data: { testid: 'save_changes_button' }
diff --git a/app/views/admin/application_settings/_note_limits.html.haml b/app/views/admin/application_settings/_note_limits.html.haml
index 99cf0ebc669..ed56f35dee4 100644
--- a/app/views/admin/application_settings/_note_limits.html.haml
+++ b/app/views/admin/application_settings/_note_limits.html.haml
@@ -12,4 +12,4 @@
         = _('List of users who are allowed to exceed the rate limit. Example: username1, username2')
 
 
-  = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true
+  = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/application_settings/_pipeline_limits.html.haml b/app/views/admin/application_settings/_pipeline_limits.html.haml
index b7dffe63777..15942c980c2 100644
--- a/app/views/admin/application_settings/_pipeline_limits.html.haml
+++ b/app/views/admin/application_settings/_pipeline_limits.html.haml
@@ -6,4 +6,4 @@
       = f.label :pipeline_limit_per_project_user_sha,  _('Maximum number of requests per minute')
       = f.number_field :pipeline_limit_per_project_user_sha, class: 'form-control gl-form-input'
 
-  = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true
+  = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/application_settings/_projects_api_limits.html.haml b/app/views/admin/application_settings/_projects_api_limits.html.haml
index c9eff76916a..a937a528e80 100644
--- a/app/views/admin/application_settings/_projects_api_limits.html.haml
+++ b/app/views/admin/application_settings/_projects_api_limits.html.haml
@@ -18,4 +18,4 @@
           .form-text.gl-text-gray-600
             = _("Set to 0 to disable the limit.")
 
-      = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true
+      = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/application_settings/_search_limits.html.haml b/app/views/admin/application_settings/_search_limits.html.haml
index b318f7e5a20..98ce675937b 100644
--- a/app/views/admin/application_settings/_search_limits.html.haml
+++ b/app/views/admin/application_settings/_search_limits.html.haml
@@ -19,4 +19,4 @@
         = _('List of users who are allowed to exceed the rate limit. Example: username1, username2')
 
 
-  = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true
+  = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/application_settings/_users_api_limits.html.haml b/app/views/admin/application_settings/_users_api_limits.html.haml
index ca6f1113c4a..7dad581f885 100644
--- a/app/views/admin/application_settings/_users_api_limits.html.haml
+++ b/app/views/admin/application_settings/_users_api_limits.html.haml
@@ -11,4 +11,4 @@
       .form-text.text-muted{ id: 'users-api-limit-users-allowlist-field-description' }
         = _('List of users who are allowed to exceed the rate limit. Example: username1, username2')
 
-  = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true
+  = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/deploy_keys/new.html.haml b/app/views/admin/deploy_keys/new.html.haml
index 3d73b255a5e..ef314bf7d6a 100644
--- a/app/views/admin/deploy_keys/new.html.haml
+++ b/app/views/admin/deploy_keys/new.html.haml
@@ -4,6 +4,6 @@
 = gitlab_ui_form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f|
   = render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
   .gl-display-flex.gl-mt-6.gl-gap-3
-    = f.submit 'Create', data: { qa_selector: "add_deploy_key_button" }, pajamas_button: true
+    = f.submit 'Create', pajamas_button: true
     = render Pajamas::ButtonComponent.new(href: admin_deploy_keys_path) do
       = _('Cancel')
diff --git a/app/views/admin/topics/_form.html.haml b/app/views/admin/topics/_form.html.haml
index c61be1182e0..85d374d7404 100644
--- a/app/views/admin/topics/_form.html.haml
+++ b/app/views/admin/topics/_form.html.haml
@@ -45,7 +45,7 @@
 
   - else
     .form-actions
-      = f.submit _('Save changes'), pajamas_button: true, data: { qa_selector: 'save_changes_button' }
+      = f.submit _('Save changes'), pajamas_button: true
       = render Pajamas::ButtonComponent.new(href: admin_topics_path) do
         = _('Cancel')