summaryrefslogtreecommitdiff
path: root/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb
diff options
context:
space:
mode:
authorJasper Maes <jaspermaes.jm@gmail.com>2018-06-02 12:46:08 +0200
committerJasper Maes <jaspermaes.jm@gmail.com>2018-06-05 08:06:35 +0200
commit85a7e0813e9806ad3eb853e4a48c09ae5f78f94c (patch)
treedb7d77148d74f600b4d7e79c568afd816b9f1b9a /db/migrate/20160226114608_add_trigram_indexes_for_searching.rb
parent800d3b88c78ee7a98fa41f3a1628c6c2a6d12a68 (diff)
downloadgitlab-ce-85a7e0813e9806ad3eb853e4a48c09ae5f78f94c.tar.gz
Support rails5 in postgres indexes function and fix some migrations
Diffstat (limited to 'db/migrate/20160226114608_add_trigram_indexes_for_searching.rb')
-rw-r--r--db/migrate/20160226114608_add_trigram_indexes_for_searching.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb b/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb
index 375e389e07a..7aa79bf5e02 100644
--- a/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb
+++ b/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb
@@ -37,7 +37,12 @@ class AddTrigramIndexesForSearching < ActiveRecord::Migration
res = execute("SELECT true AS enabled FROM pg_available_extensions WHERE name = 'pg_trgm' AND installed_version IS NOT NULL;")
row = res.first
- row && row['enabled'] == 't' ? true : false
+ check = if Gitlab.rails5?
+ true
+ else
+ 't'
+ end
+ row && row['enabled'] == check ? true : false
end
def create_trigrams_extension