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
05441b82
Commit
05441b82
authored
Sep 28, 2018
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove mistaken support for `gitlab-shell user-123`
parent
1cc2993f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
22 deletions
+1
-22
bin/gitlab-shell
bin/gitlab-shell
+1
-1
spec/gitlab_shell_gitlab_shell_spec.rb
spec/gitlab_shell_gitlab_shell_spec.rb
+0
-21
No files found.
bin/gitlab-shell
View file @
05441b82
...
...
@@ -19,7 +19,7 @@ require File.join(ROOT_PATH, 'lib', 'gitlab_shell')
# We must match e.g. "key-12345" anywhere on the command-line. See
# https://gitlab.com/gitlab-org/gitlab-shell/issues/145
who
=
/\b(?:(?:key
|user
)-[0-9]+|username-\S+)\b/
.
match
(
ARGV
.
join
(
' '
)).
to_s
who
=
/\b(?:(?:key)-[0-9]+|username-\S+)\b/
.
match
(
ARGV
.
join
(
' '
)).
to_s
if
GitlabShell
.
new
(
who
).
exec
(
original_cmd
)
exit
0
...
...
spec/gitlab_shell_gitlab_shell_spec.rb
View file @
05441b82
...
...
@@ -69,13 +69,6 @@ describe 'bin/gitlab-shell' do
expect
(
status
).
to
be_success
end
it
'succeeds and prints username when a valid known user id is given'
do
output
,
status
=
run!
([
"user-10"
])
expect
(
output
).
to
eq
(
"Welcome to GitLab, @someuser!
\n
"
)
expect
(
status
).
to
be_success
end
it
'succeeds and prints username when a valid known username is given'
do
output
,
status
=
run!
([
"username-someuser"
])
...
...
@@ -91,13 +84,6 @@ describe 'bin/gitlab-shell' do
expect
(
status
).
to
be_success
end
it
'succeeds and prints Anonymous when a valid unknown user id is given'
do
output
,
status
=
run!
([
"user-12345"
])
expect
(
output
).
to
eq
(
"Welcome to GitLab, Anonymous!
\n
"
)
expect
(
status
).
to
be_success
end
it
'succeeds and prints Anonymous when a valid unknown username is given'
do
output
,
status
=
run!
([
"username-unknown"
])
...
...
@@ -136,13 +122,6 @@ describe 'bin/gitlab-shell' do
expect
(
status
).
to
be_success
end
it
'succeeds and prints username when a valid known user id is given in the middle of other input'
do
output
,
status
=
run!
([
"-c/usr/share/webapps/gitlab-shell/bin/gitlab-shell"
,
"user-10"
,
"2foo"
])
expect
(
output
).
to
eq
(
"Welcome to GitLab, @someuser!
\n
"
)
expect
(
status
).
to
be_success
end
it
'succeeds and prints username when a valid known username is given in the middle of other input'
do
output
,
status
=
run!
([
"-c/usr/share/webapps/gitlab-shell/bin/gitlab-shell"
,
"username-someuser"
,
"foo"
])
...
...
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