diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-30 19:26:54 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-30 19:26:54 +0300 |
| commit | ff98c631c1004247656677568989e5ed68fc88f3 (patch) | |
| tree | 78f6885e314b99172e66b0580eba7cf87afc5351 /lib/gitlab/current_settings.rb | |
| parent | 333d3d9e5d1fceea97eac58a9e822ab55046a7b4 (diff) | |
Make sure that is no pending migrations in Gitlab::CurrentSettings
Diffstat (limited to 'lib/gitlab/current_settings.rb')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 46a4ef0e31f..7a86c09158e 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -38,7 +38,9 @@ module Gitlab true end - use_db && ActiveRecord::Base.connection.active? && ActiveRecord::Base.connection.table_exists?('application_settings') + use_db && ActiveRecord::Base.connection.active? && + !ActiveRecord::Migrator.needs_migration? && + ActiveRecord::Base.connection.table_exists?('application_settings') end end end |