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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
32875f9a
Commit
32875f9a
authored
May 08, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6937 from chamill/master
Provide fallback for missing `name` value.
parents
8c1201ef
04561011
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
lib/gitlab/oauth/user.rb
lib/gitlab/oauth/user.rb
+5
-1
No files found.
lib/gitlab/oauth/user.rb
View file @
32875f9a
...
@@ -65,7 +65,11 @@ module Gitlab
...
@@ -65,7 +65,11 @@ module Gitlab
end
end
def
name
def
name
auth
.
info
.
name
.
to_s
.
force_encoding
(
"utf-8"
)
if
auth
.
info
.
name
.
nil?
"
#{
auth
.
info
.
first_name
}
#{
auth
.
info
.
last_name
}
"
.
force_encoding
(
'utf-8'
)
else
auth
.
info
.
name
.
to_s
.
force_encoding
(
'utf-8'
)
end
end
end
def
username
def
username
...
...
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