Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
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
Hide 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)
- Fix 500 error when submit project snippet without body
- Improve search page usability
- Bring more UI consistency in way how projects, snippets and groups lists are rendered
- Retrieving oauth token with LDAP credentials
v 7.14.1
- Improve abuse reports management from admin area
...
...
config/initializers/doorkeeper.rb
View file @
6f785d58
...
...
@@ -12,8 +12,7 @@
end
resource_owner_from_credentials
do
|
routes
|
u
=
User
.
find_by
(
email:
params
[
:username
])
||
User
.
find_by
(
username:
params
[
:username
])
u
if
u
&&
u
.
valid_password?
(
params
[
:password
])
Gitlab
::
Auth
.
new
.
find
(
params
[
:username
],
params
[
:password
])
end
# 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