diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-08 08:29:18 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-08 08:29:18 +0000 |
| commit | 2c650b6f30d2e76cf632d6ce5771859aed67ac48 (patch) | |
| tree | 58112a7439cc49392052ab43ab29821435a509fe /app/controllers | |
| parent | 5d0b06a038a205f52f73f4cfd2947799f12698d0 (diff) | |
| parent | a0a9494e4e6db3cfcdecae0a7e9c2877432fa30b (diff) | |
| download | gitlab-ce-2c650b6f30d2e76cf632d6ce5771859aed67ac48.tar.gz | |
Merge branch 'feature/option-set-new-users-external' into 'master'
Added setting to set new users by default as external
## What does this MR do?
This implements the feature request #14508. It adds an option in the application settings to set new users by default as external.
## Are there points in the code the reviewer needs to double check?
Everything. Like I mentioned in the discussion of the issue my knowledge of Ruby basically doesn't exists. I tested it on my machine and it seems to work, but as I am very unexperienced in Ruby I highly recommend to take a close look at the code.
## Why was this MR needed?
It was requested by @DouweM to work on the issue with the proposed changes by me.
## What are the relevant issue numbers?
This MR is for the issue #14508 that followed up after the implementation of #4009.
See merge request !4545
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index cbdf2859898..23ba83aba0e 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -87,6 +87,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :version_check_enabled, :admin_notification_email, :user_oauth_applications, + :user_default_external, :shared_runners_enabled, :shared_runners_text, :max_artifacts_size, |