summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-10-01 08:49:38 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-10-01 08:49:38 +0000
commitf13636b6d11ff61bd5b840fba5ae0bbe5f77a95e (patch)
treea457b3d1bbfd7f2be25a26699c3f568399b4d0bf /config
parent6c5015ef7c185bbeeb88c4c93dd5a3ffe11919ec (diff)
parent5944e0711a9bcecd7613fc4cd486848f50ad595b (diff)
downloadgitlab-ce-f13636b6d11ff61bd5b840fba5ae0bbe5f77a95e.tar.gz
Merge branch 'dz-fix-mysql-schema' into 'master'
Fix undefined format_options method in SchemaDumper for MySQL db See merge request gitlab-org/gitlab-ce!21907
Diffstat (limited to 'config')
-rw-r--r--config/initializers/postgresql_opclasses_support.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/postgresql_opclasses_support.rb b/config/initializers/postgresql_opclasses_support.rb
index 12a0770a455..07b06629dea 100644
--- a/config/initializers/postgresql_opclasses_support.rb
+++ b/config/initializers/postgresql_opclasses_support.rb
@@ -208,5 +208,9 @@ module ActiveRecord
index_parts << "comment: #{index.comment.inspect}" if Gitlab.rails5? && index.comment
index_parts
end
+
+ def format_options(options)
+ options.map { |key, value| "#{key}: #{value.inspect}" }.join(", ")
+ end
end
end