summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMateusz Pytel <mateusz.pytel.87@gmail.com>2017-07-07 16:52:45 +0200
committerMateusz Pytel <mateusz.pytel.87@gmail.com>2017-07-07 16:54:48 +0200
commita7c571ae4d547443bd33b1d7f6e5819351239113 (patch)
tree4548ff9c271cc49ea698a7fd11ae243082ffe98c /config
parentbf0b3d835211077cb10ee3aec9ee6e0bca2304b6 (diff)
downloadgitlab-ce-a7c571ae4d547443bd33b1d7f6e5819351239113.tar.gz
#20628 Enable implicit flow in Gitlab as OAuth Provider
Closes #20628 by re-enabling implicit grant in Doorkeeper config. OAuth2 documentation refactored.
Diffstat (limited to 'config')
-rw-r--r--config/initializers/doorkeeper.rb4
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.