Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-shell
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
nexedi
gitlab-shell
Commits
4ba42756
Commit
4ba42756
authored
May 23, 2018
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump version to 7.1.3
parent
aa10b70f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
CHANGELOG
CHANGELOG
+3
-0
lib/gitlab_shell.rb
lib/gitlab_shell.rb
+7
-1
spec/gitlab_shell_spec.rb
spec/gitlab_shell_spec.rb
+1
-1
No files found.
CHANGELOG
View file @
4ba42756
v7.1.3
- Use username instead of full name for identifying users (!204)
v7.1.2
- Add missing GitlabLogger#error method (!200)
...
...
lib/gitlab_shell.rb
View file @
4ba42756
...
...
@@ -196,8 +196,14 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
end
end
def
username_from_discover
return
nil
unless
user
&&
user
[
'username'
]
"@
#{
user
[
'username'
]
}
"
end
def
username
@username
||=
user
&&
user
[
'username'
]
||
'Anonymous'
@username
||=
user
name_from_discover
||
'Anonymous'
end
# User identifier to be used in log messages.
...
...
spec/gitlab_shell_spec.rb
View file @
4ba42756
...
...
@@ -31,7 +31,7 @@ describe GitlabShell do
let
(
:api
)
do
double
(
GitlabNet
).
tap
do
|
api
|
api
.
stub
(
discover:
{
'name'
=>
'John Doe'
})
api
.
stub
(
discover:
{
'name'
=>
'John Doe'
,
'username'
=>
'testuser'
})
api
.
stub
(
check_access:
GitAccessStatus
.
new
(
true
,
'ok'
,
...
...
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