Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'config/initializers/active_record_mysql_timestamp.rb')
-rw-r--r--config/initializers/active_record_mysql_timestamp.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/active_record_mysql_timestamp.rb b/config/initializers/active_record_mysql_timestamp.rb
index af74c4ff6fb..b0e53b38978 100644
--- a/config/initializers/active_record_mysql_timestamp.rb
+++ b/config/initializers/active_record_mysql_timestamp.rb
@@ -17,7 +17,8 @@ if Gitlab::Database.mysql?
if options[:null] != false
sql << ' NULL'
elsif options[:column].default.nil?
- sql << ' DEFAULT 0'
+ # See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14383
+ sql << ' DEFAULT now()'
end
end