Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
489d241c
Commit
489d241c
authored
Nov 11, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Incorporate review comments
parent
82d7a3a3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
lib/bitbucket/page.rb
lib/bitbucket/page.rb
+1
-2
lib/omniauth/strategies/bitbucket.rb
lib/omniauth/strategies/bitbucket.rb
+1
-1
No files found.
lib/bitbucket/page.rb
View file @
489d241c
...
...
@@ -29,8 +29,7 @@ module Bitbucket
end
def
representation_class
(
type
)
class_name
=
"Bitbucket::Representation::
#{
type
.
to_s
.
camelize
}
"
class_name
.
constantize
class_name
=
Bitbucket
::
Representation
.
const_get
(
type
.
to_s
.
camelize
)
end
end
end
lib/omniauth/strategies/bitbucket.rb
View file @
489d241c
...
...
@@ -32,7 +32,7 @@ module OmniAuth
end
def
primary_email
primary
=
emails
.
find
{
|
i
|
i
[
'is_primary'
]
&&
i
[
'is_confirmed'
]
}
primary
=
emails
.
find
{
|
i
|
i
[
'is_primary'
]
&&
i
[
'is_confirmed'
]
}
primary
&&
primary
[
'email'
]
||
nil
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