diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-06 11:12:04 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-06 11:12:04 +0000 |
| commit | 1186dcabbfb8e885351c1ef05d4583fd474732e9 (patch) | |
| tree | b95eb08e86b6767ba5745ed0d743ad2ef7a0a65c | |
| parent | 8e6c4829d6539e80a28e2027ceb78d0a03d5d316 (diff) | |
| parent | da0d8e0491d993e0b5c7905c360b71fa930612d5 (diff) | |
| download | gitlab-ce-1186dcabbfb8e885351c1ef05d4583fd474732e9.tar.gz | |
Merge branch 'fix-routable-find-by-full-path-on-mysql' into 'master'
Fix `Routable.find_by_full_path` on MySQL
See merge request !11146
| -rw-r--r-- | app/models/concerns/routable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/routable.rb b/app/models/concerns/routable.rb index e351dbb45dd..c4463abdfe6 100644 --- a/app/models/concerns/routable.rb +++ b/app/models/concerns/routable.rb @@ -49,7 +49,7 @@ module Routable if Gitlab::Database.postgresql? joins(:redirect_routes).find_by("LOWER(redirect_routes.path) = LOWER(?)", path) else - joins(:redirect_routes).find_by(path: path) + joins(:redirect_routes).find_by(redirect_routes: { path: path }) end end end |