Commit a666663f authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch '353766-spinnger-migration_ssh_host_keys' into 'master'

Update spinner for ssh_host_keys partial

See merge request gitlab-org/gitlab!84230
parents 75e3e1fe 1213315c
...@@ -76,7 +76,7 @@ export default class SSHMirror { ...@@ -76,7 +76,7 @@ export default class SSHMirror {
// Disable button while we make request // Disable button while we make request
this.$btnDetectHostKeys.disable(); this.$btnDetectHostKeys.disable();
$btnLoadSpinner.removeClass('d-none'); $btnLoadSpinner.removeClass('gl-display-none');
// Make backOff polling to get data // Make backOff polling to get data
backOff((next, stop) => { backOff((next, stop) => {
...@@ -101,7 +101,7 @@ export default class SSHMirror { ...@@ -101,7 +101,7 @@ export default class SSHMirror {
.catch(stop); .catch(stop);
}) })
.then((res) => { .then((res) => {
$btnLoadSpinner.addClass('d-none'); $btnLoadSpinner.addClass('gl-display-none');
// Once data is received, we show verification info along with Host keys and fingerprints // Once data is received, we show verification info along with Host keys and fingerprints
this.$hostKeysInformation this.$hostKeysInformation
.find('.js-fingerprint-verification') .find('.js-fingerprint-verification')
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.form-group.js-ssh-host-keys-section{ class: ('collapse' unless mirror.ssh_mirror_url?) } .form-group.js-ssh-host-keys-section{ class: ('collapse' unless mirror.ssh_mirror_url?) }
%button.btn.gl-button.btn-inverted.btn-secondary.inline.js-detect-host-keys.gl-mr-3{ type: 'button', data: { qa_selector: 'detect_host_keys' } } %button.btn.gl-button.btn-inverted.btn-secondary.inline.js-detect-host-keys.gl-mr-3{ type: 'button', data: { qa_selector: 'detect_host_keys' } }
.js-spinner.d-none.gl-spinner.mr-1 = gl_loading_icon(inline: true, css_class: 'js-spinner gl-display-none gl-mr-2')
= _('Detect host keys') = _('Detect host keys')
.fingerprint-ssh-info.js-fingerprint-ssh-info.gl-mt-3.gl-mb-3{ class: ('collapse' unless mirror.ssh_mirror_url?) } .fingerprint-ssh-info.js-fingerprint-ssh-info.gl-mt-3.gl-mb-3{ class: ('collapse' unless mirror.ssh_mirror_url?) }
%label.label-bold %label.label-bold
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment