diff options
| author | Phil Hughes <me@iamphill.com> | 2017-10-27 21:56:03 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-10-27 21:56:03 +0100 |
| commit | 496c750e3f387624fd51a37954efe87ef6b465bd (patch) | |
| tree | b94bd0e1b1e0e7ae179cd2cdb91aa194d7276eb2 /lib/omni_auth | |
| parent | 90b06afdeaa13fe14218a53c8afbc4802af53a27 (diff) | |
| parent | dfd6c3f824ada5558546b809fd32468325788b94 (diff) | |
| download | gitlab-ce-ph-multi-file-upload-file.tar.gz | |
Merge branch 'master' into ph-multi-file-upload-fileph-multi-file-upload-file
Diffstat (limited to 'lib/omni_auth')
| -rw-r--r-- | lib/omni_auth/strategies/bitbucket.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/omni_auth/strategies/bitbucket.rb b/lib/omni_auth/strategies/bitbucket.rb index 5a7d67c2390..ce1bdfe6ee4 100644 --- a/lib/omni_auth/strategies/bitbucket.rb +++ b/lib/omni_auth/strategies/bitbucket.rb @@ -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 |