Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2017-03-20 18:00:09 +0300
committerYorick Peterse <yorickpeterse@gmail.com>2017-03-20 18:00:09 +0300
commitcd3e410110a5c6f33c5e873f8fb54883a8e11754 (patch)
treeabd4161440349232ddeebe144d4ffa095cba13c4 /app
parentb075d38c9b98d4b39441bd29d2c36be4637b6f72 (diff)
parent666c20cb705a9e65e2700b1fb0c6bac8f73e827e (diff)
Merge branch 'routes-lower-case' into 'master'
Remove repeated routes.path check for postgresql database See merge request !10063
Diffstat (limited to 'app')
-rw-r--r--app/models/concerns/routable.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/app/models/concerns/routable.rb b/app/models/concerns/routable.rb
index 9f6d215ceb3..529fb5ce988 100644
--- a/app/models/concerns/routable.rb
+++ b/app/models/concerns/routable.rb
@@ -51,11 +51,13 @@ module Routable
paths.each do |path|
path = connection.quote(path)
- where = "(routes.path = #{path})"
- if cast_lower
- where = "(#{where} OR (LOWER(routes.path) = LOWER(#{path})))"
- end
+ where =
+ if cast_lower
+ "(LOWER(routes.path) = LOWER(#{path}))"
+ else
+ "(routes.path = #{path})"
+ end
wheres << where
end