Commit e1da93f8 authored by Sean McGivern's avatar Sean McGivern

Merge branch...

Merge branch '345510-fix-saml-sso-redirects-for-pseudonymized-urls-for-snowplow-tracking' into 'master'

Fix SAML SSO redirects for pseudonymized URLS

See merge request gitlab-org/gitlab!74476
parents ddf16693 aa6f3db2
...@@ -75,6 +75,10 @@ class Groups::SsoController < Groups::ApplicationController ...@@ -75,6 +75,10 @@ class Groups::SsoController < Groups::ApplicationController
private private
def group
@group ||= unauthenticated_group
end
def new_user def new_user
@new_user ||= User.new(new_user_params) @new_user ||= User.new(new_user_params)
end end
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
require 'spec_helper' require 'spec_helper'
RSpec.describe 'Group SAML SSO', :js do RSpec.describe 'Group SAML SSO', :js, :snowplow do
include CookieHelper include CookieHelper
let(:user) { create(:user) } let(:user) { create(:user) }
......
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