diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-04-07 20:13:37 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-04-07 20:13:37 +0200 |
| commit | af5ea92cc4c0eb9577bb4de2ffc5a873a37fec49 (patch) | |
| tree | 07d9e5c635fc16a1c449c94876910ca8005b3b64 /app/views/devise/sessions | |
| parent | aea3712e8dd71092847eeaec6f934a426d1becc0 (diff) | |
| parent | 38ae34a30131aef38623ac5cf8c510ad04fc26a6 (diff) | |
| download | gitlab-ce-af5ea92cc4c0eb9577bb4de2ffc5a873a37fec49.tar.gz | |
Merge branch 'master' into login_page
Conflicts:
CHANGELOG
Diffstat (limited to 'app/views/devise/sessions')
| -rw-r--r-- | app/views/devise/sessions/_oauth_providers.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/devise/sessions/_oauth_providers.html.haml b/app/views/devise/sessions/_oauth_providers.html.haml index f4556eea4a2..935bc6af505 100644 --- a/app/views/devise/sessions/_oauth_providers.html.haml +++ b/app/views/devise/sessions/_oauth_providers.html.haml @@ -2,7 +2,7 @@ - if providers.present? %hr %div{:'data-no-turbolink' => 'data-no-turbolink'} - %span Sign in with*: + %span Sign in with: - providers.each do |provider| %span - if default_providers.include?(provider) |