diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-16 18:03:24 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-16 18:03:24 -0200 |
| commit | 785459d1617887ad8c3cd530c6cd79c33336fc41 (patch) | |
| tree | eaea702b7a427d14f4ffd689da23c6472e4f9b58 /config/initializers | |
| parent | dbe2ac8ccc07f53669214eb954489a6cb233d4e9 (diff) | |
| parent | b3d5ed62de3519b42dbcef2973c189467588fc36 (diff) | |
| download | gitlab-ce-785459d1617887ad8c3cd530c6cd79c33336fc41.tar.gz | |
Merge remote-tracking branch 'origin/master' into bitbucket-oauth2
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/doorkeeper.rb | 4 | ||||
| -rw-r--r-- | config/initializers/math_lexer.rb | 2 | ||||
| -rw-r--r-- | config/initializers/workhorse_multipart.rb | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index fc4b0a72add..88cd0f5f652 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -52,8 +52,8 @@ Doorkeeper.configure do # Define access token scopes for your provider # For more information go to # https://github.com/doorkeeper-gem/doorkeeper/wiki/Using-Scopes - default_scopes :api - # optional_scopes :write, :update + default_scopes(*Gitlab::Auth::DEFAULT_SCOPES) + optional_scopes(*Gitlab::Auth::OPTIONAL_SCOPES) # Change the way client credentials are retrieved from the request object. # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then diff --git a/config/initializers/math_lexer.rb b/config/initializers/math_lexer.rb new file mode 100644 index 00000000000..8a3388a267e --- /dev/null +++ b/config/initializers/math_lexer.rb @@ -0,0 +1,2 @@ +# Touch the lexers so it is registered with Rouge +Rouge::Lexers::Math diff --git a/config/initializers/workhorse_multipart.rb b/config/initializers/workhorse_multipart.rb new file mode 100644 index 00000000000..3e2f25c354a --- /dev/null +++ b/config/initializers/workhorse_multipart.rb @@ -0,0 +1,3 @@ +Rails.application.configure do |config| + config.middleware.use(Gitlab::Middleware::Multipart) +end |