Add latest changes from gitlab-org/gitlab@master

4 files changed, 3 insertions, 7 deletions

diff --git a/lib/gitlab/ci/features.rb b/lib/gitlab/ci/features.rb
index 957eee8587d..206ba029750 100644
--- a/lib/gitlab/ci/features.rb
+++ b/lib/gitlab/ci/features.rb
@@ -79,10 +79,6 @@ module Gitlab
       def self.coverage_report_view?(project)
         ::Feature.enabled?(:coverage_report_view, project)
       end
-
-      def self.expose_mr_description_predefined_variable?
-        ::Feature.enabled?(:ci_expose_mr_description_predefined_variable, default_enabled: true)
-      end
     end
   end
 end
diff --git a/lib/gitlab/diff/highlight.rb b/lib/gitlab/diff/highlight.rb
index 0d027809ba8..a5259079345 100644
--- a/lib/gitlab/diff/highlight.rb
+++ b/lib/gitlab/diff/highlight.rb
@@ -60,7 +60,7 @@ module Gitlab
         # Only update text if line is found. This will prevent
         # issues with submodules given the line only exists in diff content.
         if rich_line
-          line_prefix = diff_line.text =~ /\A(.)/ ? $1 : ' '
+          line_prefix = diff_line.text =~ /\A(.)/ ? Regexp.last_match(1) : ' '
           "#{line_prefix}#{rich_line}".html_safe
         end
       end
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb
index 7198443f72e..33f28efe284 100644
--- a/lib/gitlab/search_results.rb
+++ b/lib/gitlab/search_results.rb
@@ -186,7 +186,7 @@ module Gitlab
         params[:sort] = 'updated_desc'
 
         if query =~ /#(\d+)\z/
-          params[:iids] = $1
+          params[:iids] = Regexp.last_match(1)
         else
           params[:search] = query
         end
diff --git a/lib/gitlab/sherlock/query.rb b/lib/gitlab/sherlock/query.rb
index cbd89b7629f..6f1d2ad23c1 100644
--- a/lib/gitlab/sherlock/query.rb
+++ b/lib/gitlab/sherlock/query.rb
@@ -105,7 +105,7 @@ module Gitlab
         query.each_line
           .map { |line| line.strip }
           .join("\n")
-          .gsub(PREFIX_NEWLINE) { "\n#{$1} " }
+          .gsub(PREFIX_NEWLINE) { "\n#{Regexp.last_match(1)} " }
       end
     end
   end