Commit f13636b6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents 6c5015ef 5944e071
...@@ -208,5 +208,9 @@ module ActiveRecord ...@@ -208,5 +208,9 @@ module ActiveRecord
index_parts << "comment: #{index.comment.inspect}" if Gitlab.rails5? && index.comment index_parts << "comment: #{index.comment.inspect}" if Gitlab.rails5? && index.comment
index_parts index_parts
end end
def format_options(options)
options.map { |key, value| "#{key}: #{value.inspect}" }.join(", ")
end
end end
end end
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