Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkushalpandya <kushal@gitlab.com>2017-05-31 11:20:29 +0300
committerJarka Kadlecova <jarka@gitlab.com>2017-06-01 08:47:16 +0300
commit73af7178a5d5002924603b5688adfaac2d5736eb (patch)
treef42733b2ab531b2dddc0f2fd80e2dc9440346f5a
parentdc3de71fb79e1b9bb72eb9cf283fb94d7a089c90 (diff)
Update as per review
-rw-r--r--app/views/projects/services/_form.html.haml2
-rw-r--r--spec/javascripts/integrations/integration_settings_form_spec.js1
2 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index 0f91f08ab10..a51eb4c587e 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -13,7 +13,7 @@
= render 'shared/service_settings', form: form, subject: @service
.footer-block.row-content-block
%button.btn.btn-save{ type: 'submit' }
- %i.fa.fa-spinner.fa-spin.hidden.js-btn-spinner{ "aria-hidden" => true }
+ = icon('spinner spin', class: 'hidden js-btn-spinner')
%span.js-btn-label
Save changes
&nbsp;
diff --git a/spec/javascripts/integrations/integration_settings_form_spec.js b/spec/javascripts/integrations/integration_settings_form_spec.js
index e2a8259dea9..45909d4e70e 100644
--- a/spec/javascripts/integrations/integration_settings_form_spec.js
+++ b/spec/javascripts/integrations/integration_settings_form_spec.js
@@ -77,7 +77,6 @@ describe('IntegrationSettingsForm', () => {
integrationSettingsForm.toggleSubmitBtnLabel(true);
expect(integrationSettingsForm.$submitBtnLabel.text()).toEqual('Save changes');
-
integrationSettingsForm.canTestService = true;
integrationSettingsForm.toggleSubmitBtnLabel(false);