Merge branch 'database-fix-setting' into 'master'

Check for database connection when running current_application_settings

The PG connection errors don't always end up being caught as ActiveRecord::NoDatabaseError. So when doing a precompile without the database (like when using the omnibus), an exception was being thrown.

See merge request !292

lib/gitlab/current_settings.rb

 module Gitlab
   module CurrentSettings
     def current_application_settings
-      begin
-        if ActiveRecord::Base.connection.table_exists?('application_settings')
+      if ActiveRecord::Base.connected? && ActiveRecord::Base.connection.table_exists?('application_settings')
         ApplicationSetting.current ||
           ApplicationSetting.create_from_defaults
       else
         fake_application_settings
       end
-      rescue ActiveRecord::NoDatabaseError, database_adapter.constantize::Error
-        fake_application_settings
-      end
     end
 
     def fake_application_settings
@@ -22,16 +18,5 @@ module Gitlab
         sign_in_text: Settings.extra['sign_in_text'],
       )
     end
-
-    # We need to check which database is setup
-    # but we cannot assume that the database exists already.
-    # Not checking this will break "rake gitlab:setup".
-    def database_adapter
-      if Rails.configuration.database_configuration[Rails.env]['adapter'] == 'mysql2'
-        "Mysql2"
-      else
-        "PG"
-      end
-    end
   end
 end