Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-non-conflict

CHANGELOG

@@ -23,6 +23,7 @@ v 7.7.0
   - Close standard input in Gitlab::Popen.popen
   - Trigger GitLab CI when push tags
   - When accept merge request - do merge using sidaekiq job
+  - Enable web signups by default
 
 
 v 7.6.0

config/initializers/1_settings.rb

@@ -112,7 +112,7 @@ rescue ArgumentError # no user configured
   '/home/' + Settings.gitlab['user']
 end
 Settings.gitlab['time_zone']  ||= nil
-Settings.gitlab['signup_enabled'] ||= false
+Settings.gitlab['signup_enabled'] ||= true
 Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil?
 Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])
 Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?

lib/gitlab/current_settings.rb

@@ -8,7 +8,7 @@ module Gitlab
         else
           fake_application_settings
         end
-      rescue ActiveRecord::NoDatabaseError
+      rescue ActiveRecord::NoDatabaseError, database_adapter.constantize::Error
         fake_application_settings
       end
     end
@@ -22,5 +22,16 @@ 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