diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2016-06-02 13:31:11 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2016-06-02 13:31:11 +0200 |
| commit | 8299fc277d417278a92179fd560431785ebf532e (patch) | |
| tree | c7b31bb698b595ade7857b3bc30eb7b5df06bd12 /config/initializers/doorkeeper.rb | |
| parent | 3dc276b367fe88c3c1026371d275d6078611f625 (diff) | |
| parent | acfbeced52db321534c7b03a56a909e280d26914 (diff) | |
| download | gitlab-ce-8299fc277d417278a92179fd560431785ebf532e.tar.gz | |
Merge branch 'master' into git-http-controller
Conflicts:
config/routes.rb
Diffstat (limited to 'config/initializers/doorkeeper.rb')
| -rw-r--r-- | config/initializers/doorkeeper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 0c694e0d37a..aae2ee3193d 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -52,7 +52,7 @@ Doorkeeper.configure do # For more information go to # https://github.com/doorkeeper-gem/doorkeeper/wiki/Using-Scopes default_scopes :api - #optional_scopes :write, :update + # optional_scopes :write, :update # Change the way client credentials are retrieved from the request object. # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then @@ -71,7 +71,7 @@ Doorkeeper.configure do # The value can be any string. Use nil to disable this feature. When disabled, clients must provide a valid URL # (Similar behaviour: https://developers.google.com/accounts/docs/OAuth2InstalledApp#choosingredirecturi) # - native_redirect_uri nil#'urn:ietf:wg:oauth:2.0:oob' + native_redirect_uri nil # 'urn:ietf:wg:oauth:2.0:oob' # Specify what grant flows are enabled in array of Strings. The valid # strings and the flows they enable are: |