diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-08 00:22:50 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-08 00:22:50 -0800 |
| commit | 8589b4e137f50293952923bb07e2814257d7784d (patch) | |
| tree | 45e96152606d36a906f5a8d54ad1c245987c3b9e /app/views/devise | |
| parent | d02a22ba21f91d2aa4f9cf716dc3aefcf7e7495e (diff) | |
| download | gitlab-ce-8589b4e137f50293952923bb07e2814257d7784d.tar.gz | |
Init ApplicationSettings resource with defaults from config file
Diffstat (limited to 'app/views/devise')
| -rw-r--r-- | app/views/devise/sessions/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/devise/shared/_signin_box.html.haml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 5e31d8e818a..6d8415613d1 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -5,7 +5,7 @@ .prepend-top-20 = render 'devise/shared/oauth_box' - - if gitlab_config.signup_enabled + - if signup_enabled? .prepend-top-20 = render 'devise/shared/signup_box' diff --git a/app/views/devise/shared/_signin_box.html.haml b/app/views/devise/shared/_signin_box.html.haml index 3f2161ff6a4..70587329033 100644 --- a/app/views/devise/shared/_signin_box.html.haml +++ b/app/views/devise/shared/_signin_box.html.haml @@ -7,18 +7,18 @@ - @ldap_servers.each_with_index do |server, i| %li{class: (:active if i.zero?)} = link_to server['label'], "#tab-#{server['provider_name']}", 'data-toggle' => 'tab' - - if gitlab_config.signin_enabled + - if signin_enabled? %li = link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab' .tab-content - @ldap_servers.each_with_index do |server, i| %div.tab-pane{id: "tab-#{server['provider_name']}", class: (:active if i.zero?)} = render 'devise/sessions/new_ldap', provider: server['provider_name'] - - if gitlab_config.signin_enabled + - if signin_enabled? %div#tab-signin.tab-pane = render 'devise/sessions/new_base' - - elsif gitlab_config.signin_enabled + - elsif signin_enabled? = render 'devise/sessions/new_base' - else %div |