diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 15:09:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 15:09:30 +0000 |
| commit | c6b3ec3f56fa32a0e0ed3de0d0878d25f1adaddf (patch) | |
| tree | 967afee9a510ff9dd503ebd83706dc760ec2e3ed /app/views/projects | |
| parent | 903ccf7c93eb9490c76857bffe744249cc07de09 (diff) | |
| download | gitlab-ce-c6b3ec3f56fa32a0e0ed3de0d0878d25f1adaddf.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/mirrors/_authentication_method.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/mirrors/_ssh_host_keys.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/mirrors/_authentication_method.html.haml b/app/views/projects/mirrors/_authentication_method.html.haml index a6978cba495..c4f564e26f4 100644 --- a/app/views/projects/mirrors/_authentication_method.html.haml +++ b/app/views/projects/mirrors/_authentication_method.html.haml @@ -12,7 +12,7 @@ .form-group .collapse.js-well-changing-auth - .changing-auth-method= icon('spinner spin lg') + .changing-auth-method .well-password-auth.collapse.js-well-password-auth = f.label :password, _("Password"), class: "label-bold" = f.password_field :password, value: mirror.password, class: 'form-control qa-password', autocomplete: 'new-password' diff --git a/app/views/projects/mirrors/_ssh_host_keys.html.haml b/app/views/projects/mirrors/_ssh_host_keys.html.haml index 3279d3eb251..90236dc0c48 100644 --- a/app/views/projects/mirrors/_ssh_host_keys.html.haml +++ b/app/views/projects/mirrors/_ssh_host_keys.html.haml @@ -4,7 +4,7 @@ .form-group.js-ssh-host-keys-section{ class: ('collapse' unless mirror.ssh_mirror_url?) } %button.btn.btn-inverted.btn-secondary.inline.js-detect-host-keys.append-right-10{ type: 'button', data: { qa_selector: 'detect_host_keys' } } - = icon('spinner spin', class: 'js-spinner d-none') + .js-spinner.d-none.spinner.mr-1 = _('Detect host keys') .fingerprint-ssh-info.js-fingerprint-ssh-info.prepend-top-10.append-bottom-10{ class: ('collapse' unless mirror.ssh_mirror_url?) } %label.label-bold |