diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-02-27 12:03:22 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-02-28 12:05:19 +0100 |
| commit | 417e3ba8e3f02361a8fecd116f269fe69732a3b5 (patch) | |
| tree | 9a5e2da4c6cf54ff38f5fcf9a7680725a5bdf255 | |
| parent | 4371f845649deaf6bf31f0a675b33f1d58f64de4 (diff) | |
| download | gitlab-ce-bvl-fix-qa-doorkeeper.tar.gz | |
Specify base controller for Doorkeeperbvl-fix-qa-doorkeeper
This will make sure the `ApplicantionController#can?` method is
available for views rendering menus based on the current user's abilities.
| -rw-r--r-- | config/initializers/doorkeeper.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/oauth/authorizations_controller_spec.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index b89f0419b91..2079d3acb72 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -103,4 +103,6 @@ Doorkeeper.configure do # Some applications require dynamic query parameters on their request_uri # set to true if you want this to be allowed # wildcard_redirect_uri false + + base_controller 'ApplicationController' end diff --git a/spec/controllers/oauth/authorizations_controller_spec.rb b/spec/controllers/oauth/authorizations_controller_spec.rb index 004b463e745..149b690ff70 100644 --- a/spec/controllers/oauth/authorizations_controller_spec.rb +++ b/spec/controllers/oauth/authorizations_controller_spec.rb @@ -34,6 +34,8 @@ describe Oauth::AuthorizationsController do end context 'with valid params' do + render_views + it 'returns 200 code and renders view' do get :new, params |