Add latest changes from gitlab-org/gitlab@master

10 files changed, 11 insertions, 0 deletions

diff --git a/spec/models/blob_viewer/changelog_spec.rb b/spec/models/blob_viewer/changelog_spec.rb
index 0fcc94182af..b71531ff3c2 100644
--- a/spec/models/blob_viewer/changelog_spec.rb
+++ b/spec/models/blob_viewer/changelog_spec.rb
@@ -7,6 +7,7 @@ describe BlobViewer::Changelog do
 
   let(:project) { create(:project, :repository) }
   let(:blob) { fake_blob(path: 'CHANGELOG') }
+
   subject { described_class.new(blob) }
 
   describe '#render_error' do
diff --git a/spec/models/blob_viewer/composer_json_spec.rb b/spec/models/blob_viewer/composer_json_spec.rb
index eda34779679..a6bb64ba121 100644
--- a/spec/models/blob_viewer/composer_json_spec.rb
+++ b/spec/models/blob_viewer/composer_json_spec.rb
@@ -15,6 +15,7 @@ describe BlobViewer::ComposerJson do
     SPEC
   end
   let(:blob) { fake_blob(path: 'composer.json', data: data) }
+
   subject { described_class.new(blob) }
 
   describe '#package_name' do
diff --git a/spec/models/blob_viewer/gemspec_spec.rb b/spec/models/blob_viewer/gemspec_spec.rb
index b6cc82c03ba..291d14e2d72 100644
--- a/spec/models/blob_viewer/gemspec_spec.rb
+++ b/spec/models/blob_viewer/gemspec_spec.rb
@@ -15,6 +15,7 @@ describe BlobViewer::Gemspec do
     SPEC
   end
   let(:blob) { fake_blob(path: 'activerecord.gemspec', data: data) }
+
   subject { described_class.new(blob) }
 
   describe '#package_name' do
diff --git a/spec/models/blob_viewer/gitlab_ci_yml_spec.rb b/spec/models/blob_viewer/gitlab_ci_yml_spec.rb
index db405ceb4f1..02993052124 100644
--- a/spec/models/blob_viewer/gitlab_ci_yml_spec.rb
+++ b/spec/models/blob_viewer/gitlab_ci_yml_spec.rb
@@ -12,6 +12,7 @@ describe BlobViewer::GitlabCiYml do
   let(:data) { File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')) }
   let(:blob) { fake_blob(path: '.gitlab-ci.yml', data: data) }
   let(:sha) { sample_commit.id }
+
   subject { described_class.new(blob) }
 
   describe '#validation_message' do
diff --git a/spec/models/blob_viewer/license_spec.rb b/spec/models/blob_viewer/license_spec.rb
index e02bfae3829..b0426401932 100644
--- a/spec/models/blob_viewer/license_spec.rb
+++ b/spec/models/blob_viewer/license_spec.rb
@@ -7,6 +7,7 @@ describe BlobViewer::License do
 
   let(:project) { create(:project, :repository) }
   let(:blob) { fake_blob(path: 'LICENSE') }
+
   subject { described_class.new(blob) }
 
   describe '#license' do
diff --git a/spec/models/blob_viewer/package_json_spec.rb b/spec/models/blob_viewer/package_json_spec.rb
index b317278f3c8..7f7b1dcfcb3 100644
--- a/spec/models/blob_viewer/package_json_spec.rb
+++ b/spec/models/blob_viewer/package_json_spec.rb
@@ -15,6 +15,7 @@ describe BlobViewer::PackageJson do
     SPEC
   end
   let(:blob) { fake_blob(path: 'package.json', data: data) }
+
   subject { described_class.new(blob) }
 
   describe '#package_name' do
@@ -54,6 +55,7 @@ describe BlobViewer::PackageJson do
       SPEC
     end
     let(:blob) { fake_blob(path: 'package.json', data: data) }
+
     subject { described_class.new(blob) }
 
     describe '#package_url' do
diff --git a/spec/models/blob_viewer/podspec_json_spec.rb b/spec/models/blob_viewer/podspec_json_spec.rb
index 7f1fb8666fd..dd5ed03b77d 100644
--- a/spec/models/blob_viewer/podspec_json_spec.rb
+++ b/spec/models/blob_viewer/podspec_json_spec.rb
@@ -15,6 +15,7 @@ describe BlobViewer::PodspecJson do
     SPEC
   end
   let(:blob) { fake_blob(path: 'AFNetworking.podspec.json', data: data) }
+
   subject { described_class.new(blob) }
 
   describe '#package_name' do
diff --git a/spec/models/blob_viewer/podspec_spec.rb b/spec/models/blob_viewer/podspec_spec.rb
index 527ae79d766..2d9b184c5cb 100644
--- a/spec/models/blob_viewer/podspec_spec.rb
+++ b/spec/models/blob_viewer/podspec_spec.rb
@@ -15,6 +15,7 @@ describe BlobViewer::Podspec do
     SPEC
   end
   let(:blob) { fake_blob(path: 'Reachability.podspec', data: data) }
+
   subject { described_class.new(blob) }
 
   describe '#package_name' do
diff --git a/spec/models/blob_viewer/readme_spec.rb b/spec/models/blob_viewer/readme_spec.rb
index 958927bddb4..6586adbc373 100644
--- a/spec/models/blob_viewer/readme_spec.rb
+++ b/spec/models/blob_viewer/readme_spec.rb
@@ -7,6 +7,7 @@ describe BlobViewer::Readme do
 
   let(:project) { create(:project, :repository, :wiki_repo) }
   let(:blob) { fake_blob(path: 'README.md') }
+
   subject { described_class.new(blob) }
 
   describe '#render_error' do
diff --git a/spec/models/blob_viewer/route_map_spec.rb b/spec/models/blob_viewer/route_map_spec.rb
index f7ce873c9d1..6c703df5c4c 100644
--- a/spec/models/blob_viewer/route_map_spec.rb
+++ b/spec/models/blob_viewer/route_map_spec.rb
@@ -14,6 +14,7 @@ describe BlobViewer::RouteMap do
     MAP
   end
   let(:blob) { fake_blob(path: '.gitlab/route-map.yml', data: data) }
+
   subject { described_class.new(blob) }
 
   describe '#validation_message' do