summaryrefslogtreecommitdiff
path: root/app/models/application_setting.rb
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-04-18 09:41:20 +0530
committerTimothy Andrew <mail@timothyandrew.net>2016-04-18 09:41:20 +0530
commited1be10087e0bffc9a9b4c27d9c7dc8dfba9b427 (patch)
tree50d5d18cb0ed09043711274ca4bf7fa9d1db2682 /app/models/application_setting.rb
parentcfcd95b0c3c0c3699de8724e60cc2bce687a9132 (diff)
parente9f20f5922e9c365b4af14e53881a7bafba4139c (diff)
downloadgitlab-ce-14552-signup-password-leak.tar.gz
Merge remote-tracking branch 'origin/master' into 14552-signup-password-leak14552-signup-password-leak
Diffstat (limited to 'app/models/application_setting.rb')
-rw-r--r--app/models/application_setting.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 052cd874733..36f88154232 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -153,7 +153,8 @@ class ApplicationSetting < ActiveRecord::Base
require_two_factor_authentication: false,
two_factor_grace_period: 48,
recaptcha_enabled: false,
- akismet_enabled: false
+ akismet_enabled: false,
+ repository_checks_enabled: true,
)
end