Commit 225b43de authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Merge branch 'master' of

......@@ -101,7 +101,8 @@ v 7.10.0 (unreleased)
- Remove truncation from issue titles on milestone page (Jason Blanchard)
- Fix stuck Merge Request merging events from old installations (Ben Bodenmiller)
- Fix merge request comments on files with multiple commits
- Fix Resource Owner Password Authentication Flow
v 7.9.4
- Security: Fix project import URL regex to prevent arbitary local repos from being imported
- Fixed issue where only 25 commits would load in file listings
......@@ -11,7 +11,7 @@
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])
......@@ -83,7 +83,7 @@
# 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,
# so that the user skips the authorization step.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment