Add option for disable standard signin.
This commit is contained in:
parent
26c5102002
commit
aea3712e8d
|
@ -11,6 +11,7 @@ v 6.8.0
|
|||
- Fix popen bug in `rake gitlab:satellites:create`
|
||||
- Disable connection reaping for MySQL
|
||||
- Allow oauth signup without email for twitter and github
|
||||
- Option to disable standard login
|
||||
|
||||
v 6.7.3
|
||||
- Fix the merge notification email not being sent (Pierre de La Morinerie)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
.login-box
|
||||
%h3.page-title Sign in
|
||||
- if ldap_enabled?
|
||||
- if ldap_enabled? && gitlab_config.signin_enabled
|
||||
%ul.nav.nav-tabs
|
||||
%li.active
|
||||
= link_to 'LDAP', '#tab-ldap', 'data-toggle' => 'tab'
|
||||
|
@ -12,11 +12,18 @@
|
|||
%div#tab-signin.tab-pane
|
||||
= render partial: 'devise/sessions/new_base'
|
||||
|
||||
- else
|
||||
- elsif ldap_enabled?
|
||||
= render partial: 'devise/sessions/new_ldap'
|
||||
|
||||
- elsif gitlab_config.signin_enabled
|
||||
= render partial: 'devise/sessions/new_base'
|
||||
|
||||
- else
|
||||
%div
|
||||
No authentication methods configured.
|
||||
|
||||
= render 'devise/sessions/oauth_providers' if devise_mapping.omniauthable?
|
||||
|
||||
= render 'devise/sessions/oauth_providers' if Gitlab.config.omniauth.enabled && devise_mapping.omniauthable?
|
||||
%hr
|
||||
|
||||
- if gitlab_config.signup_enabled
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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?
|
||||
|
|
Loading…
Reference in New Issue