summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-06-01 08:42:36 +0000
committerRémy Coutable <remy@rymai.me>2016-06-01 08:42:36 +0000
commit46ac3107a4d0eaf12be8700bd33df90508e052c0 (patch)
treeb2bffbc8561667474653dd96761f97247f54e026 /config
parentcb261abee199cef178a89146afb2a3d831a391a6 (diff)
parent56f3b243ce08d105758a9b6edf96792627fa423c (diff)
downloadgitlab-ce-46ac3107a4d0eaf12be8700bd33df90508e052c0.tar.gz
Merge branch 'issue_15557' into 'master'
Fix error 500 when sorting issues by milestone due date and filtering by labels fixes #15557 See merge request !4327
Diffstat (limited to 'config')
-rw-r--r--config/initializers/doorkeeper.rb2
-rw-r--r--config/initializers/omniauth.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 393ad909b45..7bd13105045 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
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 4c164119fff..26c30e523a7 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -13,7 +13,7 @@ end
OmniAuth.config.full_host = Settings.gitlab['base_url']
OmniAuth.config.allowed_request_methods = [:post]
-#In case of auto sign-in, the GET method is used (users don't get to click on a button)
+# In case of auto sign-in, the GET method is used (users don't get to click on a button)
OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_sign_in_with_provider.present?
OmniAuth.config.before_request_phase do |env|
OmniAuth::RequestForgeryProtection.call(env)