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
Tatuya Kamada
gitlab-ce
Commits
44458f3c
Commit
44458f3c
authored
Jun 05, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add "Remember me" checkbox to LDAP signin form.
parent
3f59a8f0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
CHANGELOG
CHANGELOG
+1
-0
app/controllers/omniauth_callbacks_controller.rb
app/controllers/omniauth_callbacks_controller.rb
+1
-1
app/views/devise/sessions/_new_ldap.html.haml
app/views/devise/sessions/_new_ldap.html.haml
+5
-0
No files found.
CHANGELOG
View file @
44458f3c
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 7.12.0 (unreleased)
v 7.12.0 (unreleased)
- Add "Remember me" checkbox to LDAP signin form.
- Don't notify users mentioned in code blocks or blockquotes.
- Don't notify users mentioned in code blocks or blockquotes.
- Omit link to generate labels if user does not have access to create them (Stan Hu)
- Omit link to generate labels if user does not have access to create them (Stan Hu)
- Disable changing of the source branch in merge request update API (Stan Hu)
- Disable changing of the source branch in merge request update API (Stan Hu)
...
...
app/controllers/omniauth_callbacks_controller.rb
View file @
44458f3c
...
@@ -24,7 +24,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
...
@@ -24,7 +24,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
@user
=
Gitlab
::
LDAP
::
User
.
new
(
oauth
)
@user
=
Gitlab
::
LDAP
::
User
.
new
(
oauth
)
@user
.
save
if
@user
.
changed?
# will also save new users
@user
.
save
if
@user
.
changed?
# will also save new users
gl_user
=
@user
.
gl_user
gl_user
=
@user
.
gl_user
gl_user
.
remember_me
=
true
if
@user
.
persisted?
gl_user
.
remember_me
=
params
[
:remember_me
]
if
@user
.
persisted?
# Do additional LDAP checks for the user filter and EE features
# Do additional LDAP checks for the user filter and EE features
if
@user
.
allowed?
if
@user
.
allowed?
...
...
app/views/devise/sessions/_new_ldap.html.haml
View file @
44458f3c
=
form_tag
(
user_omniauth_callback_path
(
server
[
'provider_name'
]),
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:
"
#{
server
[
'label'
]
}
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"
}
-
if
devise_mapping
.
rememberable?
.remember-me.checkbox
%label
{
for:
"remember_me"
}
=
check_box_tag
:remember_me
,
'1'
,
false
,
id:
'remember_me'
%span
Remember me
=
button_tag
"
#{
server
[
'label'
]
}
Sign in"
,
class:
"btn-save btn"
=
button_tag
"
#{
server
[
'label'
]
}
Sign in"
,
class:
"btn-save btn"
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