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

Merge branch 'ab-44121-post-deploy-migrations-time-format' into 'master'
198495ad · Yorick Peterse · 04a3deda · 6379a849 · 198495ad
Commit 198495ad authored Mar 12, 2018 by Yorick Peterse
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

post_deployment_migration_generator.rb ...ployment_migration/post_deployment_migration_generator.rb +1 -1

No files found.
--- 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