diff options
author | Rémy Coutable <remy@rymai.me> | 2017-08-16 13:27:46 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-08-16 13:27:46 +0300 |
commit | 7b68bdce15a2f02d0b55d9fd43473408858cd6b6 (patch) | |
tree | 8430a7fc007a57398e08ebbce9a7c28fcdf33e8f /spec/javascripts | |
parent | 1b46a8360e0adffba79fad5730e94e333350f063 (diff) | |
parent | 142b9ec4a0b3e5d5cbcbb2fc3b201755f0966b9f (diff) |
Merge branch 'rs-trailingwhitespace-cop' into 'master'
Enable Layout/TrailingWhitespace cop and auto-correct offenses
See merge request !13573
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/fixtures/prometheus_service.rb | 2 | ||||
-rw-r--r-- | spec/javascripts/fixtures/services.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/spec/javascripts/fixtures/prometheus_service.rb b/spec/javascripts/fixtures/prometheus_service.rb index 7a46e47bb15..7968c9425f2 100644 --- a/spec/javascripts/fixtures/prometheus_service.rb +++ b/spec/javascripts/fixtures/prometheus_service.rb @@ -7,7 +7,7 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} let(:project) { create(:project_empty_repo, namespace: namespace, path: 'services-project') } let!(:service) { create(:prometheus_service, project: project) } - + render_views before(:all) do diff --git a/spec/javascripts/fixtures/services.rb b/spec/javascripts/fixtures/services.rb index 0a3c64d5d31..80915c32a74 100644 --- a/spec/javascripts/fixtures/services.rb +++ b/spec/javascripts/fixtures/services.rb @@ -7,7 +7,6 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} let(:project) { create(:project_empty_repo, namespace: namespace, path: 'services-project') } let!(:service) { create(:custom_issue_tracker_service, project: project, title: 'Custom Issue Tracker') } - render_views |