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
6f785d58
Commit
6f785d58
authored
Aug 27, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
retrieving oauth token with LDAP credentials
parent
abb5b9f6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
CHANGELOG
CHANGELOG
+1
-0
config/initializers/doorkeeper.rb
config/initializers/doorkeeper.rb
+1
-2
No files found.
CHANGELOG
View file @
6f785d58
...
@@ -22,6 +22,7 @@ v 8.0.0 (unreleased)
...
@@ -22,6 +22,7 @@ v 8.0.0 (unreleased)
- Fix 500 error when submit project snippet without body
- Fix 500 error when submit project snippet without body
- Improve search page usability
- Improve search page usability
- Bring more UI consistency in way how projects, snippets and groups lists are rendered
- Bring more UI consistency in way how projects, snippets and groups lists are rendered
- Retrieving oauth token with LDAP credentials
v 7.14.1
v 7.14.1
- Improve abuse reports management from admin area
- Improve abuse reports management from admin area
...
...
config/initializers/doorkeeper.rb
View file @
6f785d58
...
@@ -12,8 +12,7 @@ Doorkeeper.configure do
...
@@ -12,8 +12,7 @@ Doorkeeper.configure do
end
end
resource_owner_from_credentials
do
|
routes
|
resource_owner_from_credentials
do
|
routes
|
u
=
User
.
find_by
(
email:
params
[
:username
])
||
User
.
find_by
(
username:
params
[
:username
])
Gitlab
::
Auth
.
new
.
find
(
params
[
:username
],
params
[
:password
])
u
if
u
&&
u
.
valid_password?
(
params
[
:password
])
end
end
# If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below.
# If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below.
...
...
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