BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
a1aa4f00
Commit
a1aa4f00
authored
Oct 27, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '39495-fix-bitbucket-login' into 'master'
Fix bitbucket login Closes #39495 See merge request gitlab-org/gitlab-ce!15051
parents
6d205a9b
7d8eb4dd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
39495-fix-bitbucket-login.yml
changelogs/unreleased/39495-fix-bitbucket-login.yml
+5
-0
bitbucket.rb
lib/omni_auth/strategies/bitbucket.rb
+4
-0
No files found.
changelogs/unreleased/39495-fix-bitbucket-login.yml
0 → 100644
View file @
a1aa4f00
---
title
:
Fix bitbucket login
merge_request
:
15051
author
:
type
:
fixed
lib/omni_auth/strategies/bitbucket.rb
View file @
a1aa4f00
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment