diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-07-11 17:19:17 -0400 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-07-11 17:19:17 -0400 |
| commit | 0452e0a57e24fdd65f559cc1a8629892714adc7a (patch) | |
| tree | bf33ca472a3d434770783d80b5d10211383e706c /app/models/application_setting.rb | |
| parent | 7690513495d02d14af8a1a0cb3bf00f243ec0419 (diff) | |
| parent | f76596380fb545c54b14c6bfc339a68a1dc162d3 (diff) | |
| download | gitlab-ce-faster-diffs.tar.gz | |
Merge branch 'master' into faster-diffsfaster-diffs
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 7bf618d60b9..c6f77cc055f 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -142,6 +142,7 @@ class ApplicationSetting < ActiveRecord::Base send_user_confirmation_email: false, container_registry_token_expire_delay: 5, repository_storage: 'default', + user_default_external: false, ) end |