diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 12:09:22 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 12:09:22 +0000 |
| commit | 286fe61013674fe2d245ffc8d2233baf09923e70 (patch) | |
| tree | 2037291f5863105e54e75be056b49f7d62007cae /app/views/devise | |
| parent | 4cb5e5011abfe8d50ac3a7ebd0018c563c6d7af4 (diff) | |
| download | gitlab-ce-286fe61013674fe2d245ffc8d2233baf09923e70.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/devise')
| -rw-r--r-- | app/views/devise/shared/_omniauth_box.html.haml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml index 1b583ea85d6..cca0f756e76 100644 --- a/app/views/devise/shared/_omniauth_box.html.haml +++ b/app/views/devise/shared/_omniauth_box.html.haml @@ -10,8 +10,9 @@ = provider_image_tag(provider) %span = label_for_provider(provider) - %fieldset.remember-me - %label - = check_box_tag :remember_me, nil, false, class: 'remember-me-checkbox' - %span - Remember me + - unless defined?(hide_remember_me) && hide_remember_me + %fieldset.remember-me + %label + = check_box_tag :remember_me, nil, false, class: 'remember-me-checkbox' + %span + Remember me |