diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-30 19:11:36 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-04-30 19:11:36 +0300 |
| commit | e71351d4f463715fccd80ddbcb4dade67e80f34b (patch) | |
| tree | 3afbee536963f4a1eb4ea22d2624827e2adf50e0 /config | |
| parent | 5af7fd59e53061700bb2db781711aec0b958253c (diff) | |
| parent | 0f593b1c579c272f681696b96a8fc6aa32342ae6 (diff) | |
Merge branch 'bvl-fix-openid-redirect' into 'master'
Skip `authenticate_user!` for Doorkeeper controllers
Closes #44639
See merge request gitlab-org/gitlab-ce!18599
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/9_fast_gettext.rb (renamed from config/initializers/fast_gettext.rb) | 0 | ||||
| -rw-r--r-- | config/initializers/doorkeeper.rb | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/fast_gettext.rb b/config/initializers/9_fast_gettext.rb index fd0167aa476..fd0167aa476 100644 --- a/config/initializers/fast_gettext.rb +++ b/config/initializers/9_fast_gettext.rb diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 2079d3acb72..e3a342590d4 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -104,5 +104,5 @@ Doorkeeper.configure do # set to true if you want this to be allowed # wildcard_redirect_uri false - base_controller 'ApplicationController' + base_controller '::Gitlab::BaseDoorkeeperController' end |