Skip to content
Snippets Groups Projects
Commit 24ff249d authored by Kamil Trzcińśki's avatar Kamil Trzcińśki
Browse files

Merge branch 'ce-jej/fix-sso-enforced-docker-registry-auth' into 'master'

[CE backport]  Enforced SSO shouldn't break container registry authentication

See merge request gitlab-org/gitlab-ce!32110
parents 20d38fed e00b07b9
No related branches found
No related tags found
No related merge requests found
# frozen_string_literal: true
 
class JwtController < ApplicationController
skip_around_action :set_session_storage
skip_before_action :authenticate_user!
skip_before_action :verify_authenticity_token
before_action :authenticate_project_or_user
Loading
Loading
Loading
Loading
@@ -108,6 +108,14 @@ describe JwtController do
end
end
end
it 'does not cause session based checks to be activated' do
expect(Gitlab::Session).not_to receive(:with_session)
get '/jwt/auth', params: parameters, headers: headers
expect(response).to have_gitlab_http_status(200)
end
end
 
context 'using invalid login' do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment