diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 22:34:03 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 22:34:03 +0100 |
| commit | 8fb49a4b7005d7e57bb84d6fe5db97ff39d1064b (patch) | |
| tree | 38118628101e0b9281a07c295d15d0c9f075197b /config | |
| parent | f39ff54290abe224b0b79accc0da48c1cd2d2109 (diff) | |
| parent | e616739e2fae12e5358d2cea40089a51468d9b4a (diff) | |
| download | gitlab-ce-8fb49a4b7005d7e57bb84d6fe5db97ff39d1064b.tar.gz | |
Merge branch 'master' into merge-if-green
# Conflicts:
# app/views/projects/merge_requests/widget/_heading.html.haml
# app/views/projects/merge_requests/widget/open/_accept.html.haml
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/omniauth.rb | 2 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 70ed10e8275..4c164119fff 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -16,7 +16,7 @@ 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) 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.new(env).call + OmniAuth::RequestForgeryProtection.call(env) end if Gitlab.config.omniauth.enabled diff --git a/config/routes.rb b/config/routes.rb index b1f34700c00..ea5d88fc3c3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -500,6 +500,7 @@ Rails.application.routes.draw do member do get :commits get :ci + get :languages end end |