Rescue missing database errors

While loading the Rails app we cannot assume that the gitlabhq_xxx database exists already. If we do, `rake gitlab:setup` breaks! This is a quick hack to make sure that fresh development setups of GitLab (from master) will work again.

Rescue missing database errors
bc95576e · Jacob Vosmaer · d531de0b · bc95576e
Commit bc95576e authored Jan 09, 2015 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

current_settings.rb lib/gitlab/current_settings.rb +8 -4

No files found.
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
 module Gitlab
  module CurrentSettings
    def current_application_settings
-      if ActiveRecord::Base.connection.table_exists?('application_settings')
-        ApplicationSetting.current ||
-          ApplicationSetting.create_from_defaults
-      else
+      begin
+        if ActiveRecord::Base.connection.table_exists?('application_settings')
+          ApplicationSetting.current ||
+            ApplicationSetting.create_from_defaults
+        else
+          fake_application_settings
+        end
+      rescue ActiveRecord::NoDatabaseError
        fake_application_settings
      end
    end