Revert "Merge branch 'rs-revert-11842' into 'master'"

This reverts commit ad521bde, reversing changes made to 3a38e5f1.

Revert "Merge branch 'rs-revert-11842' into 'master'"
This reverts commit ad521bde, reversing changes made to 3a38e5f1.
84cfb33f · Stan Hu · f01c5d86 · 84cfb33f
Commit 84cfb33f authored Jun 17, 2017 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

lib/gitlab/current_settings.rb lib/gitlab/current_settings.rb +2 -1

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