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

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

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