Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 17 deletions

diff --git a/app/models/concerns/routable.rb b/app/models/concerns/routable.rb
index 8b011bca72c..57118bf7a6b 100644
--- a/app/models/concerns/routable.rb
+++ b/app/models/concerns/routable.rb
@@ -33,16 +33,9 @@ module Routable
     #
     # Returns a single object, or nil.
     def find_by_full_path(path, follow_redirects: false)
-      routable_calls_counter.increment(method: 'find_by_full_path')
-
-      if Feature.enabled?(:routable_two_step_lookup)
-        # Case sensitive match first (it's cheaper and the usual case)
-        # If we didn't have an exact match, we perform a case insensitive search
-        found = includes(:route).find_by(routes: { path: path }) || where_full_path_in([path]).take
-      else
-        order_sql = Arel.sql("(CASE WHEN routes.path = #{connection.quote(path)} THEN 0 ELSE 1 END)")
-        found = where_full_path_in([path]).reorder(order_sql).take
-      end
+      # Case sensitive match first (it's cheaper and the usual case)
+      # If we didn't have an exact match, we perform a case insensitive search
+      found = includes(:route).find_by(routes: { path: path }) || where_full_path_in([path]).take
 
       return found if found
 
@@ -61,19 +54,12 @@ module Routable
     def where_full_path_in(paths)
       return none if paths.empty?
 
-      routable_calls_counter.increment(method: 'where_full_path_in')
-
       wheres = paths.map do |path|
         "(LOWER(routes.path) = LOWER(#{connection.quote(path)}))"
       end
 
       includes(:route).where(wheres.join(' OR ')).references(:routes)
     end
-
-    # Temporary instrumentation of method calls
-    def routable_calls_counter
-      @routable_calls_counter ||= Gitlab::Metrics.counter(:gitlab_routable_calls_total, 'Number of calls to Routable by method')
-    end
   end
 
   def full_name