Align mirror action buttons to right, fix detect host keys padding and fix multiple push mirrors

app/assets/stylesheets/pages/settings.scss

@@ -352,3 +352,7 @@
 .push-pull-table {
   margin-top: 1em;
 }
+
+.mirror-action-buttons {
+  padding-right: 0 !important;
+}
\ No newline at end of file

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

@@ -64,7 +64,7 @@
                   %td
                     - if mirror.last_error.present?
                       .badge.mirror-error-badge{ data: { toggle: 'tooltip', html: 'true' }, title: html_escape(mirror.last_error.try(:strip)) }= _('Error')
-                  %td
-                    .btn-group.mirror-actions-group{ role: 'group' }
+                  %td.mirror-action-buttons
+                    .btn-group.mirror-actions-group.pull-right{ role: 'group' }
                       = render 'shared/remote_mirror_update_button', remote_mirror: mirror
                       %button.js-delete-mirror.btn.btn-danger{ type: 'button', data: { mirror_id: mirror.id, toggle: 'tooltip', container: 'body' }, title: _('Remove') }= icon('trash-o')

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

@@ -6,9 +6,9 @@
     %td
       - if @project.import_error.present?
         .badge.mirror-error-badge{ data: { toggle: 'tooltip', html: 'true' }, title: html_escape(@project.import_error.try(:strip)) }= _('Error')
-    %td
-      .btn-group.mirror-actions-group{ role: 'group' }
-        - if @project.mirror? && can?(current_user, :push_code, @project)
+    %td.mirror-action-buttons
+      .btn-group.mirror-actions-group.pull-right{ role: 'group' }
+        - if @project.mirror?
           - if @project.mirror_about_to_update? || @project.updating_mirror?
             %button.btn.disabled{ type: 'button', data: { container: 'body', toggle: 'tooltip' }, title: _('Updating') }= icon("refresh spin")
           - else

ee/app/views/projects/mirrors/_push_pull_form.html.haml

@@ -6,7 +6,7 @@
 
 - if can_push
   %template.js-push-mirrors-form
-    = f.fields_for :remote_mirrors, @remote_mirror do |rm_f|
+    = f.fields_for :remote_mirrors, @project.remote_mirrors.build do |rm_f|
       = rm_f.hidden_field :enabled, value: '1'
       = rm_f.hidden_field :url, class: 'js-mirror-url-hidden', required: true, pattern: "(#{protocols}):\/\/.+"
       = rm_f.hidden_field :only_protected_branches, class: 'js-mirror-protected-hidden'

ee/app/views/projects/mirrors/pull/_ssh_host_keys.html.haml

@@ -3,7 +3,7 @@
 - verified_at = import_data.ssh_known_hosts_verified_at
 
 .form-group.js-ssh-host-keys-section{ class: ('collapse' unless import_data.ssh_import?) }
-  %button.btn.btn-inverted.btn-success.inline.js-detect-host-keys{ type: 'button' }
+  %button.btn.btn-inverted.btn-success.inline.js-detect-host-keys.append-right-10{ type: 'button' }
     = icon('spinner spin', class: 'detect-host-keys-load-spinner hidden')
     = _('Detect host keys')
   .fingerprint-ssh-info.js-fingerprint-ssh-info{ class: ('collapse' unless import_data.ssh_import?) }

ee/app/views/shared/_mirror_trigger_builds_setting.html.haml

@@ -4,7 +4,7 @@
 
 .form-check.append-bottom-10
   = f.check_box :mirror_trigger_builds, check_box_options.merge(class: "form-check-input")
-  = f.label :mirror_trigger_builds, _("Trigger pipelines for mirror updates"), class: "label-bold form-check-label"
+  = f.label :mirror_trigger_builds, _("Trigger pipelines for mirror updates"), class: "form-check-label"
   .form-text.text-muted
     = _('Trigger pipelines when branches or tags are updated from the upstream repository. Depending on the activity of the upstream repository, this may greatly increase the load on your CI runners. Only enable this if you know they can handle the load.')
     %strong= _('CI will run using the credentials assigned above.')