diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /config/initializers/doorkeeper.rb | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
download | gitlab-ce-f64a639bcfa1fc2bc89ca7db268f594306edfd7c.tar.gz |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'config/initializers/doorkeeper.rb')
-rw-r--r-- | config/initializers/doorkeeper.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 1cf70909997..4533779339a 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -106,4 +106,10 @@ Doorkeeper.configure do # realm "Doorkeeper" base_controller '::Gitlab::BaseDoorkeeperController' + + # Allow Resource Owner Password Credentials Grant without client credentials, + # this was disabled by default in Doorkeeper 5.5. + # + # We might want to disable this in the future, see https://gitlab.com/gitlab-org/gitlab/-/issues/323615 + skip_client_authentication_for_password_grant true end |