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
984f8077
Commit
984f8077
authored
Apr 17, 2015
by
Roshan Gautam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Resource Owner Password Authentication Flow
parent
e1099f97
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
CHANGELOG
CHANGELOG
+2
-1
config/initializers/doorkeeper.rb
config/initializers/doorkeeper.rb
+2
-2
No files found.
CHANGELOG
View file @
984f8077
...
@@ -101,6 +101,7 @@ v 7.10.0 (unreleased)
...
@@ -101,6 +101,7 @@ v 7.10.0 (unreleased)
- Remove truncation from issue titles on milestone page (Jason Blanchard)
- Remove truncation from issue titles on milestone page (Jason Blanchard)
- Fix stuck Merge Request merging events from old installations (Ben Bodenmiller)
- Fix stuck Merge Request merging events from old installations (Ben Bodenmiller)
- Fix merge request comments on files with multiple commits
- Fix merge request comments on files with multiple commits
- Fix Resource Owner Password Authentication Flow
v 7.9.4
v 7.9.4
- Security: Fix project import URL regex to prevent arbitary local repos from being imported
- Security: Fix project import URL regex to prevent arbitary local repos from being imported
...
...
config/initializers/doorkeeper.rb
View file @
984f8077
...
@@ -11,7 +11,7 @@ Doorkeeper.configure do
...
@@ -11,7 +11,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
])
u
=
User
.
find_by
(
email:
params
[
:username
])
||
User
.
find_by
(
username:
params
[
:username
])
u
if
u
&&
u
.
valid_password?
(
params
[
:password
])
u
if
u
&&
u
.
valid_password?
(
params
[
:password
])
end
end
...
@@ -83,7 +83,7 @@ Doorkeeper.configure do
...
@@ -83,7 +83,7 @@ Doorkeeper.configure do
#
#
# If not specified, Doorkeeper enables all the four grant flows.
# If not specified, Doorkeeper enables all the four grant flows.
#
#
# grant_flows %w(authorization_code implicit
password client_credentials)
grant_flows
%w(authorization_code
password client_credentials)
# Under some circumstances you might want to have applications auto-approved,
# Under some circumstances you might want to have applications auto-approved,
# so that the user skips the authorization step.
# so that the user skips the authorization step.
...
...
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