summaryrefslogtreecommitdiff
path: root/lib/gitlab_shell.rb
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2018-07-25 13:34:24 +1000
committerAsh McKenzie <amckenzie@gitlab.com>2018-07-25 22:01:14 +1000
commit319794918a90da5e68b4858c7fc29eff704b0c96 (patch)
tree5742a49ecac7ebd931b13f466b7c6ece12982e01 /lib/gitlab_shell.rb
parentb03540ffe75d914db1e0d7de05e577db7d5e0c2c (diff)
downloadgitlab-shell-319794918a90da5e68b4858c7fc29eff704b0c96.tar.gz
Add and user LogHelper
Diffstat (limited to 'lib/gitlab_shell.rb')
-rw-r--r--lib/gitlab_shell.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index 180e5eb..cd6fcb9 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -5,10 +5,12 @@ require_relative 'gitlab_net'
require_relative 'gitlab_metrics'
require_relative 'current_user_helper'
require_relative 'api_command_helper'
+require_relative 'log_helper'
class GitlabShell # rubocop:disable Metrics/ClassLength
include CurrentUserHelper
include APICommandHelper
+ include LogHelper
class AccessDeniedError < StandardError; end
class DisallowedCommandError < StandardError; end
@@ -189,12 +191,6 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
GitlabNet.new
end
-
- # User identifier to be used in log messages.
- def log_username
- config.audit_usernames ? username : "user with key #{key_id}"
- end
-
def lfs_authenticate
lfs_access = api.lfs_authenticate(key_id, repo_name)
return unless lfs_access