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
09791774
Commit
09791774
authored
Mar 13, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use custom LDAP label in LDAP signin form.
parent
606d24ff
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
CHANGELOG
CHANGELOG
+1
-0
app/views/devise/sessions/_new_ldap.html.haml
app/views/devise/sessions/_new_ldap.html.haml
+3
-3
app/views/devise/shared/_signin_box.html.haml
app/views/devise/shared/_signin_box.html.haml
+1
-1
No files found.
CHANGELOG
View file @
09791774
...
@@ -61,6 +61,7 @@ v 7.9.0 (unreleased)
...
@@ -61,6 +61,7 @@ v 7.9.0 (unreleased)
- Allow smb:// links in Markdown text.
- Allow smb:// links in Markdown text.
- Filter merge request by title or description at Merge Requests page
- Filter merge request by title or description at Merge Requests page
- Block user if he/she was blocked in Active Directory
- Block user if he/she was blocked in Active Directory
- Use custom LDAP label in LDAP signin form.
v 7.8.4
v 7.8.4
- Fix issue_tracker_id substitution in custom issue trackers
- Fix issue_tracker_id substitution in custom issue trackers
...
...
app/views/devise/sessions/_new_ldap.html.haml
View file @
09791774
=
form_tag
(
user_omniauth_callback_path
(
provider
),
id:
'new_ldap_user'
)
do
=
form_tag
(
user_omniauth_callback_path
(
server
[
'provider_name'
]
),
id:
'new_ldap_user'
)
do
=
text_field_tag
:username
,
nil
,
{
class:
"form-control top"
,
placeholder:
"
LDAP
Login"
,
autofocus:
"autofocus"
}
=
text_field_tag
:username
,
nil
,
{
class:
"form-control top"
,
placeholder:
"
#{
server
[
'label'
]
}
Login"
,
autofocus:
"autofocus"
}
=
password_field_tag
:password
,
nil
,
{
class:
"form-control bottom"
,
placeholder:
"Password"
}
=
password_field_tag
:password
,
nil
,
{
class:
"form-control bottom"
,
placeholder:
"Password"
}
=
button_tag
"
LDAP
Sign in"
,
class:
"btn-save btn"
=
button_tag
"
#{
server
[
'label'
]
}
Sign in"
,
class:
"btn-save btn"
app/views/devise/shared/_signin_box.html.haml
View file @
09791774
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
.tab-content
.tab-content
-
@ldap_servers
.
each_with_index
do
|
server
,
i
|
-
@ldap_servers
.
each_with_index
do
|
server
,
i
|
%div
.tab-pane
{
id:
"tab-#{server['provider_name']}"
,
class:
(
:active
if
i
.
zero?
)}
%div
.tab-pane
{
id:
"tab-#{server['provider_name']}"
,
class:
(
:active
if
i
.
zero?
)}
=
render
'devise/sessions/new_ldap'
,
provider:
server
[
'provider_name'
]
=
render
'devise/sessions/new_ldap'
,
server:
server
-
if
signin_enabled?
-
if
signin_enabled?
%div
#tab-signin
.tab-pane
%div
#tab-signin
.tab-pane
=
render
'devise/sessions/new_base'
=
render
'devise/sessions/new_base'
...
...
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