Commit 856618ec authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'bvl-fix-qa-doorkeeper' into 'master'

Specify base controller for Doorkeeper

See merge request gitlab-org/gitlab-ce!17416
parents 2aa647ec 417e3ba8
...@@ -103,4 +103,6 @@ Doorkeeper.configure do ...@@ -103,4 +103,6 @@ Doorkeeper.configure do
# Some applications require dynamic query parameters on their request_uri # Some applications require dynamic query parameters on their request_uri
# set to true if you want this to be allowed # set to true if you want this to be allowed
# wildcard_redirect_uri false # wildcard_redirect_uri false
base_controller 'ApplicationController'
end end
...@@ -34,6 +34,8 @@ describe Oauth::AuthorizationsController do ...@@ -34,6 +34,8 @@ describe Oauth::AuthorizationsController do
end end
context 'with valid params' do context 'with valid params' do
render_views
it 'returns 200 code and renders view' do it 'returns 200 code and renders view' do
get :new, params get :new, params
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment