summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJasper Maes <jaspermaes.jm@gmail.com>2018-07-09 23:07:57 +0200
committerJasper Maes <jaspermaes.jm@gmail.com>2018-07-09 23:27:06 +0200
commit7ce51548acc8fe27ec9325a9a9583e22edbc2822 (patch)
tree25d46537c6d5cf7dbab29c04545d4ef790557eca /config
parent3edda4c257d49014ad8bbd2c77646bb9a35cb756 (diff)
downloadgitlab-ce-7ce51548acc8fe27ec9325a9a9583e22edbc2822.tar.gz
Rails5 MySQL fix rename_column as part of cleanup_concurrent_column_type_change
Diffstat (limited to 'config')
-rw-r--r--config/initializers/active_record_table_definition.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/config/initializers/active_record_table_definition.rb b/config/initializers/active_record_table_definition.rb
index 8e3a1c7a62f..a71069f27a3 100644
--- a/config/initializers/active_record_table_definition.rb
+++ b/config/initializers/active_record_table_definition.rb
@@ -29,6 +29,11 @@ module ActiveRecord
def datetime_with_timezone(column_name, **options)
column(column_name, :datetime_with_timezone, options)
end
+
+ # Disable timestamp alias to datetime
+ def aliased_types(name, fallback)
+ fallback
+ end
end
end
end