summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2018-03-12 21:28:05 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2018-03-12 21:28:05 +0000
commit198495adf4736b48b93473c996e55ee9b73a2739 (patch)
treedb52d4d3a98b351b4cd19ae98ce251b859bb94ff
parent04a3dedab10e14a19537c558d3290e7977dde311 (diff)
parent6379a849c0a9ab004f68307dac5375443f3e49fa (diff)
downloadgitlab-ce-198495adf4736b48b93473c996e55ee9b73a2739.tar.gz
Merge branch 'ab-44121-post-deploy-migrations-time-format' into 'master'
Fix timestamp to include %M instead of %I for post-deploy migrations. Closes #44121 See merge request gitlab-org/gitlab-ce!17699
-rw-r--r--lib/generators/rails/post_deployment_migration/post_deployment_migration_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/generators/rails/post_deployment_migration/post_deployment_migration_generator.rb b/lib/generators/rails/post_deployment_migration/post_deployment_migration_generator.rb
index 7cb4bccb23c..91175b49c79 100644
--- a/lib/generators/rails/post_deployment_migration/post_deployment_migration_generator.rb
+++ b/lib/generators/rails/post_deployment_migration/post_deployment_migration_generator.rb
@@ -3,7 +3,7 @@ require 'rails/generators'
module Rails
class PostDeploymentMigrationGenerator < Rails::Generators::NamedBase
def create_migration_file
- timestamp = Time.now.strftime('%Y%m%d%H%I%S')
+ timestamp = Time.now.strftime('%Y%m%d%H%M%S')
template "migration.rb", "db/post_migrate/#{timestamp}_#{file_name}.rb"
end