Commit e3c433bc authored by Kerri Miller's avatar Kerri Miller

Merge branch 'nicolasdular/welcome-helper-cleanup' into 'master'

Cleanup welcome helper method

See merge request gitlab-org/gitlab!47184
parents 281efedb 000cd01b
...@@ -13,7 +13,7 @@ module EE ...@@ -13,7 +13,7 @@ module EE
end end
def in_invitation_flow? def in_invitation_flow?
redirect_path&.starts_with?('/-/invites/') redirect_path.present? && redirect_path.starts_with?('/-/invites/')
end end
def in_oauth_flow? def in_oauth_flow?
......
...@@ -42,7 +42,7 @@ RSpec.describe EE::WelcomeHelper do ...@@ -42,7 +42,7 @@ RSpec.describe EE::WelcomeHelper do
'/-/invites/xxx' | true '/-/invites/xxx' | true
'/invites/xxx' | false '/invites/xxx' | false
'/foo' | false '/foo' | false
nil | nil nil | false
end end
with_them do with_them do
......
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