Add latest changes from gitlab-org/gitlab@master

1 files changed, 35 insertions, 34 deletions

diff --git a/spec/frontend/fixtures/search.rb b/spec/frontend/fixtures/search.rb
index db1ef67998f..b2da383d657 100644
--- a/spec/frontend/fixtures/search.rb
+++ b/spec/frontend/fixtures/search.rb
@@ -23,40 +23,41 @@ RSpec.describe SearchController, '(JavaScript fixtures)', type: :controller do
     let(:namespace) { create(:namespace, name: 'frontend-fixtures') }
     let(:project) { create(:project, :public, :repository, namespace: namespace, path: 'search-project') }
     let(:blobs) do
-      Kaminari.paginate_array([
-        Gitlab::Search::FoundBlob.new(
-          path: 'CHANGELOG',
-          basename: 'CHANGELOG',
-          ref: 'master',
-          data: "hello\nworld\nfoo\nSend # this is the highligh\nbaz\nboo\nbat",
-          project: project,
-          project_id: project.id,
-          startline: 2),
-        Gitlab::Search::FoundBlob.new(
-          path: 'CONTRIBUTING',
-          basename: 'CONTRIBUTING',
-          ref: 'master',
-          data: "hello\nworld\nfoo\nSend # this is the highligh\nbaz\nboo\nbat",
-          project: project,
-          project_id: project.id,
-          startline: 2),
-        Gitlab::Search::FoundBlob.new(
-          path: 'README',
-          basename: 'README',
-          ref: 'master',
-          data: "foo\nSend # this is the highlight\nbaz\nboo\nbat",
-          project: project,
-          project_id: project.id,
-          startline: 2),
-        Gitlab::Search::FoundBlob.new(
-          path: 'test',
-          basename: 'test',
-          ref: 'master',
-          data: "foo\nSend # this is the highlight\nbaz\nboo\nbat",
-          project: project,
-          project_id: project.id,
-          startline: 2)
-     ],
+      Kaminari.paginate_array(
+        [
+          Gitlab::Search::FoundBlob.new(
+            path: 'CHANGELOG',
+            basename: 'CHANGELOG',
+            ref: 'master',
+            data: "hello\nworld\nfoo\nSend # this is the highligh\nbaz\nboo\nbat",
+            project: project,
+            project_id: project.id,
+            startline: 2),
+          Gitlab::Search::FoundBlob.new(
+            path: 'CONTRIBUTING',
+            basename: 'CONTRIBUTING',
+            ref: 'master',
+            data: "hello\nworld\nfoo\nSend # this is the highligh\nbaz\nboo\nbat",
+            project: project,
+            project_id: project.id,
+            startline: 2),
+          Gitlab::Search::FoundBlob.new(
+            path: 'README',
+            basename: 'README',
+            ref: 'master',
+            data: "foo\nSend # this is the highlight\nbaz\nboo\nbat",
+            project: project,
+            project_id: project.id,
+            startline: 2),
+          Gitlab::Search::FoundBlob.new(
+            path: 'test',
+            basename: 'test',
+            ref: 'master',
+            data: "foo\nSend # this is the highlight\nbaz\nboo\nbat",
+            project: project,
+            project_id: project.id,
+            startline: 2)
+        ],
      total_count: 4,
      limit: 4,
      offset: 0)