Create ApplicationSettings if does not exist in runtime

1 files changed, 13 insertions, 8 deletions

diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 60efc70aa40..f3b9dcacdee 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -2,16 +2,21 @@ module Gitlab
   module CurrentSettings
     def current_application_settings
       if ActiveRecord::Base.connection.table_exists?('application_settings')
-        ApplicationSetting.current
+        ApplicationSetting.current ||
+          ApplicationSetting.create_from_defaults
       else
-        OpenStruct.new(
-          default_projects_limit: Settings.gitlab['default_projects_limit'],
-          signup_enabled: Settings.gitlab['signup_enabled'],
-          signin_enabled: Settings.gitlab['signin_enabled'],
-          gravatar_enabled: Settings.gravatar['enabled'],
-          sign_in_text: Settings.extra['sign_in_text'],
-        )
+        fake_application_settings
       end
     end
+
+    def fake_application_settings
+      OpenStruct.new(
+        default_projects_limit: Settings.gitlab['default_projects_limit'],
+        signup_enabled: Settings.gitlab['signup_enabled'],
+        signin_enabled: Settings.gitlab['signin_enabled'],
+        gravatar_enabled: Settings.gravatar['enabled'],
+        sign_in_text: Settings.extra['sign_in_text'],
+      )
+    end
   end
 end