Add latest changes from gitlab-org/gitlab@master

9 files changed, 15 insertions, 1 deletions

diff --git a/qa/Gemfile b/qa/Gemfile
index da45ba3b955..f55d27c159b 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'gitlab-qa'
diff --git a/qa/Rakefile b/qa/Rakefile
index 6bafec2a67d..0a040f0aee7 100644
--- a/qa/Rakefile
+++ b/qa/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'qa/tools/revoke_all_personal_access_tokens'
 require_relative 'qa/tools/delete_subgroups'
 require_relative 'qa/tools/generate_perf_testdata'
diff --git a/qa/bin/qa b/qa/bin/qa
index cbaad4bd7ad..4328adf719b 100755
--- a/qa/bin/qa
+++ b/qa/bin/qa
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require_relative '../qa'
 
diff --git a/qa/bin/rubymine b/qa/bin/rubymine
index 0be0cf0ec33..7db50f4aade 100755
--- a/qa/bin/rubymine
+++ b/qa/bin/rubymine
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require_relative '../qa'
 
diff --git a/qa/qa/fixtures/auto_devops_rack/Gemfile b/qa/qa/fixtures/auto_devops_rack/Gemfile
index fc7514242d0..2c7c77adf94 100644
--- a/qa/qa/fixtures/auto_devops_rack/Gemfile
+++ b/qa/qa/fixtures/auto_devops_rack/Gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gem 'rack'
 gem 'rake'
diff --git a/qa/qa/fixtures/auto_devops_rack/Rakefile b/qa/qa/fixtures/auto_devops_rack/Rakefile
index c865c9aaac1..a6d08103d55 100644
--- a/qa/qa/fixtures/auto_devops_rack/Rakefile
+++ b/qa/qa/fixtures/auto_devops_rack/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake/testtask'
 
 task default: %w[test]
diff --git a/qa/qa/fixtures/auto_devops_rack/config.ru b/qa/qa/fixtures/auto_devops_rack/config.ru
index e990662145a..aea28ef1893 100644
--- a/qa/qa/fixtures/auto_devops_rack/config.ru
+++ b/qa/qa/fixtures/auto_devops_rack/config.ru
@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 run lambda { |env| [200, { 'Content-Type' => 'text/plain' }, StringIO.new("Hello World! #{ENV['OPTIONAL_MESSAGE']}\n")] }
diff --git a/qa/qa/page/page_concern.rb b/qa/qa/page/page_concern.rb
index 6ba2d27f574..cf1153c0ca3 100644
--- a/qa/qa/page/page_concern.rb
+++ b/qa/qa/page/page_concern.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module QA
   module Page
     module PageConcern
diff --git a/qa/qa/page/search/results.rb b/qa/qa/page/search/results.rb
index 7dab3881ede..3f7aa837d3c 100644
--- a/qa/qa/page/search/results.rb
+++ b/qa/qa/page/search/results.rb
@@ -4,7 +4,7 @@ module QA
   module Page
     module Search
       class Results < QA::Page::Base
-        view 'app/assets/javascripts/search/topbar/constants.js' do
+        view 'app/views/search/_category.html.haml' do
           element :code_tab
           element :projects_tab
         end