diff options
| author | Semyon Pupkov <mail@semyonpupkov.com> | 2017-02-12 11:02:26 +0300 |
|---|---|---|
| committer | Semyon Pupkov <mail@semyonpupkov.com> | 2017-02-15 12:29:48 +0300 |
| commit | 0dfccd995aa9bf560e59299f3a4f1705d6981115 (patch) | |
| tree | c6ab80041dd2b83ed4c245b0824c2ace70872eb2 /app/views/devise | |
| parent | 1452729304393978ec93b712130dff6687db01b9 (diff) | |
Add active_when helper
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24036
Diffstat (limited to 'app/views/devise')
| -rw-r--r-- | app/views/devise/shared/_signin_box.html.haml | 2 | ||||
| -rw-r--r-- | app/views/devise/shared/_tabs_ldap.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/devise/shared/_signin_box.html.haml b/app/views/devise/shared/_signin_box.html.haml index eddfce363a7..da4769e214e 100644 --- a/app/views/devise/shared/_signin_box.html.haml +++ b/app/views/devise/shared/_signin_box.html.haml @@ -4,7 +4,7 @@ .login-body = render 'devise/sessions/new_crowd' - @ldap_servers.each_with_index do |server, i| - .login-box.tab-pane{ id: "#{server['provider_name']}", role: 'tabpanel', class: (:active if i.zero? && !crowd_enabled?) } + .login-box.tab-pane{ id: "#{server['provider_name']}", role: 'tabpanel', class: active_when(i.zero? && !crowd_enabled?) } .login-body = render 'devise/sessions/new_ldap', server: server - if signin_enabled? diff --git a/app/views/devise/shared/_tabs_ldap.html.haml b/app/views/devise/shared/_tabs_ldap.html.haml index 8c4ad30c832..dd34600490e 100644 --- a/app/views/devise/shared/_tabs_ldap.html.haml +++ b/app/views/devise/shared/_tabs_ldap.html.haml @@ -3,7 +3,7 @@ %li.active = link_to "Crowd", "#crowd", 'data-toggle' => 'tab' - @ldap_servers.each_with_index do |server, i| - %li{ class: (:active if i.zero? && !crowd_enabled?) } + %li{ class: active_when(i.zero? && !crowd_enabled?) } = link_to server['label'], "##{server['provider_name']}", 'data-toggle' => 'tab' - if signin_enabled? %li |