diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-07-24 17:45:12 -0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-07-27 12:09:46 -0400 |
| commit | e561b142fa7c9dd636fd056fc0a6c84961d0cd46 (patch) | |
| tree | 10e34698af1d5a3647840faee470e6047b782e30 /config | |
| parent | 9981814514742a2ee507d4dcc2fd71099fd96585 (diff) | |
| download | gitlab-ce-e561b142fa7c9dd636fd056fc0a6c84961d0cd46.tar.gz | |
Backport gitlab-ee!2456
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/doorkeeper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 8e2e639fc41..40e635bf2cf 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -92,9 +92,9 @@ Doorkeeper.configure do # Under some circumstances you might want to have applications auto-approved, # so that the user skips the authorization step. # For example if dealing with trusted a application. - # skip_authorization do |resource_owner, client| - # client.superapp? or resource_owner.admin? - # end + skip_authorization do |resource_owner, client| + client.application.trusted? + end # WWW-Authenticate Realm (default "Doorkeeper"). # realm "Doorkeeper" |