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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
dcaeee45
Commit
dcaeee45
authored
Feb 04, 2016
by
Peter Hudec
Committed by
Rémy Coutable
Feb 23, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show Crowd login even when sign-in is disabled
parent
06f7fd2f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
CHANGELOG
CHANGELOG
+1
-0
app/views/devise/sessions/new.html.haml
app/views/devise/sessions/new.html.haml
+1
-1
No files found.
CHANGELOG
View file @
dcaeee45
Please view this file on the master branch, on stable branches it's out of date.
Please view this file on the master branch, on stable branches it's out of date.
v 8.6.0 (unreleased)
v 8.6.0 (unreleased)
- Show Crowd login tab when sign in is disabled and Crowd is enabled (Peter Hudec)
v 8.5.0
v 8.5.0
- Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji (Stan Hu)
- Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji (Stan Hu)
...
...
app/views/devise/sessions/new.html.haml
View file @
dcaeee45
-
page_title
"Sign in"
-
page_title
"Sign in"
%div
%div
-
if
signin_enabled?
||
ldap_enabled?
-
if
signin_enabled?
||
ldap_enabled?
||
crowd_enabled?
=
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
...
...
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