diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-04-26 12:05:18 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-04-30 11:40:51 +0200 |
| commit | 0f593b1c579c272f681696b96a8fc6aa32342ae6 (patch) | |
| tree | e208c60558ff3cefc75a8551a3d3804379344162 /config | |
| parent | 507e3fbca30441983322c37408988b6a49f0acc5 (diff) | |
| download | gitlab-ce-0f593b1c579c272f681696b96a8fc6aa32342ae6.tar.gz | |
Define custom base controller for Doorkeeper
Since we only need the `can?` view helpers there, it's better to
include those in a separate controller.
If we inherit from `ApplicationController` we also need to deal with
authentication, that needs to be done in some, but not all doorkeeper controllers.
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 |