Commit 4083ea1c authored by Yorick Peterse's avatar Yorick Peterse

Merge branch 'rails5-fix-47376' into 'master'

Rails 5 fix glob spec

Closes #47376

See merge request gitlab-org/gitlab-ce!19469
parents 6b41118f 2d1faddb
---
title: Rails 5 fix glob spec
merge_request: 19469
author: Jasper Maes
type: fixed
...@@ -35,8 +35,9 @@ describe Gitlab::SQL::Glob do ...@@ -35,8 +35,9 @@ describe Gitlab::SQL::Glob do
value = query("SELECT #{quote(string)} LIKE #{pattern}") value = query("SELECT #{quote(string)} LIKE #{pattern}")
.rows.flatten.first .rows.flatten.first
check = Gitlab.rails5? ? true : 't'
case value case value
when 't', 1 when check, 1
true true
else else
false false
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment