diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-06-06 14:10:22 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-06-06 14:10:22 +0300 |
| commit | 4083ea1c74c7d89201a8bbf797635e1a208498d4 (patch) | |
| tree | 4f157249328e5bbfb8e7b010ae2de93ef635f41a | |
| parent | 6b41118f2ebcbeb443fa0fd0350c21f725e3ed54 (diff) | |
| parent | 2d1faddbcb3b814a381f91cf48cc597d47b29ee0 (diff) | |
Merge branch 'rails5-fix-47376' into 'master'
Rails 5 fix glob spec
Closes #47376
See merge request gitlab-org/gitlab-ce!19469
| -rw-r--r-- | changelogs/unreleased/rails5-fix-47376.yml | 5 | ||||
| -rw-r--r-- | spec/lib/gitlab/sql/glob_spec.rb | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/rails5-fix-47376.yml b/changelogs/unreleased/rails5-fix-47376.yml new file mode 100644 index 00000000000..ac9950e908e --- /dev/null +++ b/changelogs/unreleased/rails5-fix-47376.yml @@ -0,0 +1,5 @@ +--- +title: Rails 5 fix glob spec +merge_request: 19469 +author: Jasper Maes +type: fixed diff --git a/spec/lib/gitlab/sql/glob_spec.rb b/spec/lib/gitlab/sql/glob_spec.rb index f0bb4294d62..1cf8935bfe3 100644 --- a/spec/lib/gitlab/sql/glob_spec.rb +++ b/spec/lib/gitlab/sql/glob_spec.rb @@ -35,8 +35,9 @@ describe Gitlab::SQL::Glob do value = query("SELECT #{quote(string)} LIKE #{pattern}") .rows.flatten.first + check = Gitlab.rails5? ? true : 't' case value - when 't', 1 + when check, 1 true else false |