kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Fix bitbucket login

Closes #39495

See merge request gitlab-org/gitlab-ce!15051
This commit is contained in:
Rémy Coutable 2017-10-27 08:22:53 +00:00
parent 6d205a9b2c 7d8eb4ddb0
commit a1aa4f00c2
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/39495-fix-bitbucket-login.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix bitbucket login
merge_request: 15051
author:
type: fixed

4
lib/omni_auth/strategies/bitbucket.rb
View File

@ -36,6 +36,10 @@ module OmniAuth
email_response = access_token.get('api/2.0/user/emails').parsed
@emails ||= email_response && email_response['values'] || nil
end
def callback_url
options[:redirect_uri] || (full_host + script_name + callback_path)
end
end
end
end