diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-07-07 18:41:32 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-07-07 18:41:32 +0000 |
| commit | 9a708aec4b3ba8d7a410c4b06534d0d128470bf8 (patch) | |
| tree | 75f764ca3bed46e149864600550ddeb56829db94 /config | |
| parent | 426271dacbb3b7462e4f7a78fa3628bbd267609a (diff) | |
| parent | a7c571ae4d547443bd33b1d7f6e5819351239113 (diff) | |
| download | gitlab-ce-9a708aec4b3ba8d7a410c4b06534d0d128470bf8.tar.gz | |
Merge branch '20628-add-oauth-implicit-grant' into 'master'
#20628 Enable implicit flow in Gitlab as OAuth Provider
Closes #20628, #2716, and #19470
See merge request !12384
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/doorkeeper.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index a5636765774..8e2e639fc41 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -87,9 +87,7 @@ Doorkeeper.configure do # "password" => Resource Owner Password Credentials Grant Flow # "client_credentials" => Client Credentials Grant Flow # - # If not specified, Doorkeeper enables all the four grant flows. - # - grant_flows %w(authorization_code password client_credentials) + grant_flows %w(authorization_code implicit password client_credentials) # Under some circumstances you might want to have applications auto-approved, # so that the user skips the authorization step. |