Merge branch...

Merge branch '222428-ux-pajamas-implementation-move-buttons-in-settings-repository-to-the-right' into 'master'

Move buttons in Settings > Repository to the right

Closes #222428

See merge request gitlab-org/gitlab!38647

app/views/admin/application_settings/_initial_branch_name.html.haml

@@ -9,4 +9,6 @@
       = f.text_field :default_branch_name, placeholder: 'master', class: 'form-control'
       %span.form-text.text-muted
         = (_("Changes affect new repositories only. If not specified, Git's default name %{branch_name_default} will be used.") % { branch_name_default: fallback_branch_name } ).html_safe
-  = f.submit _('Save changes'), class: 'gl-button btn-success'
+
+  .gl-display-flex.gl-justify-content-end
+    = f.submit _('Save changes'), class: 'gl-button btn-success'

app/views/admin/application_settings/_repository_check.html.haml

@@ -14,9 +14,12 @@
             %a{ href: 'https://git-scm.com/docs/git-fsck', target: 'blank' } 'git fsck'
             in all project and wiki repositories to look for silent disk corruption issues.
       .form-group
-        = link_to 'Clear all repository checks', clear_repository_check_states_admin_application_settings_path, data: { confirm: 'This will clear repository check states for ALL projects in the database. This cannot be undone. Are you sure?' }, method: :put, class: "btn btn-sm btn-remove"
         .form-text.text-muted
           If you got a lot of false alarms from repository checks you can choose to clear all repository check information from the database.
+          - clear_repository_checks_link = _('Clear all repository checks')
+          - clear_repository_checks_message = _('This will clear repository check states for ALL projects in the database. This cannot be undone. Are you sure?')
+        .gl-display-flex.gl-justify-content-end
+          = link_to clear_repository_checks_link, clear_repository_check_states_admin_application_settings_path, data: { confirm: clear_repository_checks_message }, method: :put, class: "btn btn-sm btn-remove"
 
     .sub-section
       %h4 Housekeeping
@@ -53,4 +56,5 @@
         .form-text.text-muted
           Number of Git pushes after which 'git gc' is run.
 
-  = f.submit 'Save changes', class: "btn btn-success"
+  .gl-display-flex.gl-justify-content-end
+    = f.submit _('Save changes'), class: "btn btn-success"

app/views/admin/application_settings/_repository_mirrors_form.html.haml

@@ -14,4 +14,5 @@
 
     = render_if_exists 'admin/application_settings/mirror_settings', form: f
 
-  = f.submit _('Save changes'), class: "btn btn-success"
+  .gl-display-flex.gl-justify-content-end
+    = f.submit _('Save changes'), class: "btn btn-success"

app/views/admin/application_settings/_repository_static_objects.html.haml

@@ -15,4 +15,5 @@
       %span.form-text.text-muted#static_objects_external_storage_auth_token_help_block
         = _('A secure token that identifies an external storage request.')
 
-  = f.submit _('Save changes'), class: "btn btn-success"
+  .gl-display-flex.gl-justify-content-end
+    = f.submit _('Save changes'), class: "btn btn-success"

app/views/admin/application_settings/_repository_storage.html.haml

@@ -22,5 +22,5 @@
             = f.text_field attribute[:name], class: 'form-text-input', value: attribute[:value]
             = f.label attribute[:label], attribute[:label], class: 'label-bold form-check-label'
             %br
-
-  = f.submit _('Save changes'), class: "btn btn-success qa-save-changes-button"
+  .gl-display-flex.gl-justify-content-end
+    = f.submit _('Save changes'), class: "btn btn-success qa-save-changes-button"

app/views/projects/cleanup/_show.html.haml

@@ -25,5 +25,7 @@
           = f.file_field :bfg_object_map, class: "hidden js-object-map-input", required: true
         .form-text.text-muted
           = _("The maximum file size allowed is %{size}.") % { size: number_to_human_size(Gitlab::CurrentSettings.max_attachment_size.megabytes) }
-      = f.submit _('Start cleanup'), class: 'btn btn-success'
+
+      .gl-display-flex.gl-justify-content-end
+        = f.submit _('Start cleanup'), class: 'btn btn-success'
 

app/views/projects/default_branch/_show.html.haml

@@ -28,4 +28,5 @@
               = _("Issues referenced by merge requests and commits within the default branch will be closed automatically")
               = link_to icon('question-circle'), help_page_path('user/project/issues/managing_issues.md', anchor: 'disabling-automatic-issue-closing'), target: '_blank'
 
-      = f.submit 'Save changes', class: "btn btn-success"
+      .gl-display-flex.gl-justify-content-end
+        = f.submit _('Save changes'), class: "btn btn-success"

app/views/projects/mirrors/_mirror_repos.html.haml

@@ -32,7 +32,7 @@
               = label_tag :only_protected_branches, _('Only mirror protected branches'), class: 'form-check-label'
               = link_to icon('question-circle'), help_page_path('user/project/protected_branches'), target: '_blank'
 
-          .panel-footer
+          .panel-footer.gl-display-flex.gl-justify-content-end
             = f.submit _('Mirror repository'), class: 'btn btn-success js-mirror-submit qa-mirror-repository-button', name: :update_remote_mirror
     - else
       .gl-alert.gl-alert-info{ role: 'alert' }

app/views/projects/protected_tags/shared/_create_protected_tag.html.haml

@@ -24,5 +24,5 @@
           .create_access_levels-container
             = yield :create_access_levels
 
-    .card-footer
-      = f.submit 'Protect', class: 'btn-success btn', disabled: true, data: { qa_selector: 'protect_tag_button' }
+    .card-footer.gl-display-flex.gl-justify-content-end
+      = f.submit _('Protect'), class: 'btn-success btn', disabled: true, data: { qa_selector: 'protect_tag_button' }

app/views/shared/deploy_keys/_project_group_form.html.haml

@@ -20,5 +20,5 @@
       %p.light.gl-mb-0
         = _('Allow this key to push to repository as well? (Default only allows pull access.)')
 
-  .form-group.row
-    = f.submit "Add key", class: "btn-success btn"
+  .form-group.row.gl-display-flex.gl-justify-content-end
+    = f.submit _("Add key"), class: "btn-success btn"

app/views/shared/deploy_tokens/_form.html.haml

@@ -45,5 +45,5 @@
         = label_tag ("deploy_token_write_package_registry"), 'write_package_registry', class: 'label-bold form-check-label'
         .text-secondary= s_('DeployTokens|Allows write access to the package registry')
 
-  .gl-mt-3
+  .gl-mt-3.gl-display-flex.gl-justify-content-end
     = f.submit s_('DeployTokens|Create deploy token'), class: 'btn btn-success qa-create-deploy-token'

ee/app/views/shared/push_rules/_form.html.haml

@@ -79,4 +79,5 @@
     Set to 0 to allow files of any size.
     Files tracked by Git LFS are exempted.
 
-= f.submit "Save Push Rules", class: "btn btn-success", data: { qa_selector: 'submit_settings_button' }
+.gl-display-flex.gl-justify-content-end
+  = f.submit _("Save Push Rules"), class: "btn btn-success", data: { qa_selector: 'submit_settings_button' }

locale/gitlab.pot

@@ -1524,6 +1524,9 @@ msgstr ""
 msgid "Add italic text"
 msgstr ""
 
+msgid "Add key"
+msgstr ""
+
 msgid "Add label(s)"
 msgstr ""
 
@@ -4916,6 +4919,9 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
+msgid "Clear all repository checks"
+msgstr ""
+
 msgid "Clear chart filters"
 msgstr ""
 
@@ -19555,6 +19561,9 @@ msgstr ""
 msgid "Prompt users to upload SSH keys"
 msgstr ""
 
+msgid "Protect"
+msgstr ""
+
 msgid "Protect variable"
 msgstr ""
 
@@ -20989,6 +20998,9 @@ msgstr ""
 msgid "Save Changes"
 msgstr ""
 
+msgid "Save Push Rules"
+msgstr ""
+
 msgid "Save anyway"
 msgstr ""
 
@@ -25031,6 +25043,9 @@ msgstr ""
 msgid "This variable can not be masked."
 msgstr ""
 
+msgid "This will clear repository check states for ALL projects in the database. This cannot be undone. Are you sure?"
+msgstr ""
+
 msgid "This will help us personalize your onboarding experience."
 msgstr ""