diff options
| author | Bernardo Anderson <bernardodsanderson@gmail.com> | 2016-10-22 14:51:59 -0500 |
|---|---|---|
| committer | Bernardo Anderson <bernardodsanderson@gmail.com> | 2016-10-22 14:51:59 -0500 |
| commit | 85062dfd258179021205ff9a22aa3a9d089de40b (patch) | |
| tree | 90300e479f8f83d3fa7363c807c690c0d9884033 /app/views | |
| parent | 2eb452402f6d9ac7dc6a5b083dab824fa9767c4d (diff) | |
| parent | a98ad03ba18da0b1534f36dafafa9a1c644d0bf1 (diff) | |
| download | gitlab-ce-85062dfd258179021205ff9a22aa3a9d089de40b.tar.gz | |
Merge branch 'master' into sign_in_forgot_password
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/devise/sessions/two_factor.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/sessions/two_factor.html.haml b/app/views/devise/sessions/two_factor.html.haml index 0e865b807c1..fd77cdbee2e 100644 --- a/app/views/devise/sessions/two_factor.html.haml +++ b/app/views/devise/sessions/two_factor.html.haml @@ -10,7 +10,7 @@ = form_for(resource, as: resource_name, url: session_path(resource_name), method: :post, html: { class: 'edit_user show-gl-field-errors' }) do |f| - resource_params = params[resource_name].presence || params = f.hidden_field :remember_me, value: resource_params.fetch(:remember_me, 0) - .form-group + %div = f.label 'Two-Factor Authentication code', name: :otp_attempt = f.text_field :otp_attempt, class: 'form-control', required: true, autofocus: true, autocomplete: 'off', title: 'This field is required.' %p.help-block.hint Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes. diff --git a/app/views/devise/shared/_tabs_ldap.html.haml b/app/views/devise/shared/_tabs_ldap.html.haml index a057f126c45..1e957f0935f 100644 --- a/app/views/devise/shared/_tabs_ldap.html.haml +++ b/app/views/devise/shared/_tabs_ldap.html.haml @@ -1,4 +1,4 @@ -%ul.new-session-tabs.nav-links.nav-tabs +%ul.new-session-tabs.nav-links.nav-tabs{ class: ('custom-provider-tabs' if form_based_providers.any?) } - if crowd_enabled? %li.active = link_to "Crowd", "#crowd", 'data-toggle' => 'tab' |