Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
284eccb5
Commit
284eccb5
authored
May 04, 2016
by
Andrei Gliga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
render the omniauth_box if there are any button_based_providers
parent
d943e5f6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/views/devise/sessions/new.html.haml
app/views/devise/sessions/new.html.haml
+1
-1
No files found.
app/views/devise/sessions/new.html.haml
View file @
284eccb5
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
=
render
'devise/shared/signin_box'
=
render
'devise/shared/signin_box'
-# Omniauth fits between signin/ldap signin and signup and does not have a surrounding box
-# Omniauth fits between signin/ldap signin and signup and does not have a surrounding box
-
if
omniauth_enabled?
&&
devise_mapping
.
omniauthable?
-
if
omniauth_enabled?
&&
devise_mapping
.
omniauthable?
&&
button_based_providers_enabled?
.clearfix.prepend-top-20
.clearfix.prepend-top-20
=
render
'devise/shared/omniauth_box'
=
render
'devise/shared/omniauth_box'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment