diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-26 11:34:42 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-26 11:34:42 +0000 |
| commit | a0d57ee2b35f0e232aff930a94dfbcabe2860158 (patch) | |
| tree | 9d0bdfc5879c3000ecf12648fa9d62a606888189 /config/initializers | |
| parent | d77ced23a596870b7deb223956968d2273720631 (diff) | |
| parent | 78faa6e3706570b8bf5f8d9f331135080a82679d (diff) | |
| download | gitlab-ce-a0d57ee2b35f0e232aff930a94dfbcabe2860158.tar.gz | |
Merge branch '42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-ico' into 'master'
Port some non-EE-specific config/ changes to CE
Closes #42420
See merge request gitlab-org/gitlab-ce!16710
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/0_post_deployment_migrations.rb | 12 | ||||
| -rw-r--r-- | config/initializers/date_time_formats.rb | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/config/initializers/0_post_deployment_migrations.rb b/config/initializers/0_post_deployment_migrations.rb index 0068a03d214..3d81b869b52 100644 --- a/config/initializers/0_post_deployment_migrations.rb +++ b/config/initializers/0_post_deployment_migrations.rb @@ -2,11 +2,13 @@ # before other initializers as Rails may otherwise memoize a list of migrations # excluding the post deployment migrations. unless ENV['SKIP_POST_DEPLOYMENT_MIGRATIONS'] - path = Rails.root.join('db', 'post_migrate').to_s + Rails.application.config.paths['db'].each do |db_path| + path = Rails.root.join(db_path, 'post_migrate').to_s - Rails.application.config.paths['db/migrate'] << path + Rails.application.config.paths['db/migrate'] << path - # Rails memoizes migrations at certain points where it won't read the above - # path just yet. As such we must also update the following list of paths. - ActiveRecord::Migrator.migrations_paths << path + # Rails memoizes migrations at certain points where it won't read the above + # path just yet. As such we must also update the following list of paths. + ActiveRecord::Migrator.migrations_paths << path + end end diff --git a/config/initializers/date_time_formats.rb b/config/initializers/date_time_formats.rb index 57568203cab..1939ced512d 100644 --- a/config/initializers/date_time_formats.rb +++ b/config/initializers/date_time_formats.rb @@ -2,8 +2,10 @@ # :medium - Nov 10, 2007 # :long - November 10, 2007 Date::DATE_FORMATS[:medium] = '%b %-d, %Y' +Date::DATE_FORMATS[:csv] = '%Y-%m-%d' # :short - 18 Jan 06:10 # :medium - Jan 18, 2007 6:10am # :long - January 18, 2007 06:10 Time::DATE_FORMATS[:medium] = '%b %-d, %Y %-I:%M%P' +Time::DATE_FORMATS[:csv] = '%Y-%m-%d %H:%M:%S' |