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/user.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/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 695a47ba6eb..79c670cb35a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -15,7 +15,7 @@ class User < ActiveRecord::Base add_authentication_token_field :authentication_token default_value_for :admin, false - default_value_for :external, false + default_value_for(:external) { current_application_settings.user_default_external } default_value_for :can_create_group, gitlab_config.default_can_create_group default_value_for :can_create_team, false default_value_for :hide_no_ssh_key, false |