diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-04-07 17:11:06 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-04-07 17:11:06 +0200 |
| commit | aea3712e8dd71092847eeaec6f934a426d1becc0 (patch) | |
| tree | 3b4623645b826e06d311b5dcd977a539afbfc1c2 /config | |
| parent | 26c5102002ac78bb328e11a2f273800e853b3fa9 (diff) | |
| download | gitlab-ce-aea3712e8dd71092847eeaec6f934a426d1becc0.tar.gz | |
Add option for disable standard signin.
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 6 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index d9ac1c02ef5..3b1427cba70 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -54,8 +54,12 @@ production: &base ## Users management - # default: false - Account passwords are not sent via the email if signup is enabled. + # default: false - Account passwords are not sent via the email if signup is enabled. # signup_enabled: true + # + # default: true - If set to false, standard login form won't be shown on the sign-in page + # signin_enabled: false + # Restrict setting visibility levels for non-admin users. # The default is to allow all levels. diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 70ba26cea7a..ce672372a3d 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -87,6 +87,7 @@ rescue ArgumentError # no user configured '/home/' + Settings.gitlab['user'] end Settings.gitlab['signup_enabled'] ||= false +Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil? Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], []) Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil? Settings.gitlab['issue_closing_pattern'] = '([Cc]loses|[Ff]ixes) #(\d+)' if Settings.gitlab['issue_closing_pattern'].nil? |