diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-06-17 07:30:15 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-06-19 09:43:01 -0700 |
| commit | 84cfb33fbb60898f9b56137832b2c5abb622465c (patch) | |
| tree | dbf2a3a3c0bc7a8a84ca505bcc67f21b5107369c /lib | |
| parent | f01c5d8627ce069e84f04e587ab59ebbf7e8ac88 (diff) | |
| download | gitlab-ce-84cfb33fbb60898f9b56137832b2c5abb622465c.tar.gz | |
Revert "Merge branch 'rs-revert-11842' into 'master'"
This reverts commit ad521bde1bb556709edd39d8a9aa67ee47605b91, reversing
changes made to 3a38e5f1ab914bc4eaeecda6e18caaa7ca9ea5a7.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 2fd5452dd78..48735fd197d 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -62,7 +62,8 @@ module Gitlab active_db_connection = ActiveRecord::Base.connection.active? rescue false active_db_connection && - ActiveRecord::Base.connection.table_exists?('application_settings') + ActiveRecord::Base.connection.table_exists?('application_settings') && + !ActiveRecord::Migrator.needs_migration? rescue ActiveRecord::NoDatabaseError false end |