Commit a1aa4f00 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '39495-fix-bitbucket-login' into 'master'

Fix bitbucket login

Closes #39495

See merge request gitlab-org/gitlab-ce!15051
parents 6d205a9b 7d8eb4dd
---
title: Fix bitbucket login
merge_request: 15051
author:
type: fixed
...@@ -36,6 +36,10 @@ module OmniAuth ...@@ -36,6 +36,10 @@ module OmniAuth
email_response = access_token.get('api/2.0/user/emails').parsed email_response = access_token.get('api/2.0/user/emails').parsed
@emails ||= email_response && email_response['values'] || nil @emails ||= email_response && email_response['values'] || nil
end end
def callback_url
options[:redirect_uri] || (full_host + script_name + callback_path)
end
end end
end end
end end
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