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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
673c23dd
Commit
673c23dd
authored
Sep 28, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unbreak all the tests relying on one login-box.
parent
69f9c00c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/views/devise/sessions/new.html.haml
app/views/devise/sessions/new.html.haml
+1
-1
app/views/devise/shared/_omniauth_box.html.haml
app/views/devise/shared/_omniauth_box.html.haml
+1
-1
No files found.
app/views/devise/sessions/new.html.haml
View file @
673c23dd
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
=
render
'devise/shared/signup_box'
=
render
'devise/shared/signup_box'
-
if
omniauth_enabled?
&&
devise_mapping
.
omniauthable?
&&
button_based_providers_enabled?
-
if
omniauth_enabled?
&&
devise_mapping
.
omniauthable?
&&
button_based_providers_enabled?
.clearfix
.omniauth-box
.clearfix
=
render
'devise/shared/omniauth_box'
=
render
'devise/shared/omniauth_box'
-# Show a message if none of the mechanisms above are enabled
-# Show a message if none of the mechanisms above are enabled
...
...
app/views/devise/shared/_omniauth_box.html.haml
View file @
673c23dd
%div
.
login-box
%div
.
omniauth-container
%p
%p
%span
.light
%span
.light
Sign in with
Sign in with
...
...
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