summaryrefslogtreecommitdiff
path: root/lib/gitlab_shell.rb
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-09-25 14:26:35 +0000
committerNick Thomas <nick@gitlab.com>2018-09-25 14:26:35 +0000
commit1cc2993f357c4467e4d45c54c01d2307103efb3e (patch)
tree990d233c522bfbcba0a1000ce6d31e4b078fd8aa /lib/gitlab_shell.rb
parentdd54651b987c473fc42ae6c81daf0a47a92f9dca (diff)
parent5f12a6a41a46800841ba02e72a6a4eb6d5e129ae (diff)
downloadgitlab-shell-1cc2993f357c4467e4d45c54c01d2307103efb3e.tar.gz
Merge branch 'ash.mckenzie/display-feedback-v2' into 'master'
Display helpful feedback when proxying an SSH git push to secondary request (v2) See merge request gitlab-org/gitlab-shell!246
Diffstat (limited to 'lib/gitlab_shell.rb')
-rw-r--r--lib/gitlab_shell.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index 79af861..57c70f5 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -95,8 +95,9 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
$stderr.puts "GitLab: Invalid repository path"
false
rescue Action::Custom::BaseError => ex
- $logger.warn('Custom action error', command: origin_cmd, user: log_username)
- $stderr.puts "GitLab: #{ex.message}"
+ $logger.warn('Custom action error', exception: ex.class, message: ex.message,
+ command: origin_cmd, user: log_username)
+ $stderr.puts ex.message
false
end