diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /config/initializers/active_record_table_definition.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'config/initializers/active_record_table_definition.rb')
-rw-r--r-- | config/initializers/active_record_table_definition.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/active_record_table_definition.rb b/config/initializers/active_record_table_definition.rb index 81a8e5906f4..9220620da41 100644 --- a/config/initializers/active_record_table_definition.rb +++ b/config/initializers/active_record_table_definition.rb @@ -16,7 +16,7 @@ module ActiveRecord options[:null] = false if options[:null].nil? [:created_at, :updated_at].each do |column_name| - column(column_name, :datetime_with_timezone, options) + column(column_name, :datetime_with_timezone, **options) end end @@ -27,7 +27,7 @@ module ActiveRecord # t.datetime_with_timezone :did_something_at # end def datetime_with_timezone(column_name, **options) - column(column_name, :datetime_with_timezone, options) + column(column_name, :datetime_with_timezone, **options) end # Disable timestamp alias to datetime |