diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-28 14:05:38 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-28 14:05:38 +0000 |
| commit | 856618ece06e179393f0a5343f4e57dd6f3ef728 (patch) | |
| tree | 593f0e6b1a33dbf42f3bbf71fd319a1034a6ca80 | |
| parent | 2aa647ec07edd0caaad9c2b56f8ab24bfea4e6f6 (diff) | |
| parent | 417e3ba8e3f02361a8fecd116f269fe69732a3b5 (diff) | |
| download | gitlab-ce-856618ece06e179393f0a5343f4e57dd6f3ef728.tar.gz | |
Merge branch 'bvl-fix-qa-doorkeeper' into 'master'
Specify base controller for Doorkeeper
See merge request gitlab-org/gitlab-ce!17416
| -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 |