summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-04-12 16:13:24 +0100
committerRémy Coutable <remy@rymai.me>2017-04-14 15:20:55 +0200
commit380e40fee30d836e6dffb1e956df39033d43a671 (patch)
tree8258a84cb620aa707539730815cccc62ff8d0335 /lib/api
parent00e9568e140165edcc091bd6729393cdeaac642b (diff)
downloadgitlab-ce-380e40fee30d836e6dffb1e956df39033d43a671.tar.gz
Remove unused user activities code
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/helpers/internal_helpers.rb3
-rw-r--r--lib/api/internal.rb10
-rw-r--r--lib/api/users.rb1
3 files changed, 1 insertions, 13 deletions
diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb
index 8f25bcf2f54..718f936a1fc 100644
--- a/lib/api/helpers/internal_helpers.rb
+++ b/lib/api/helpers/internal_helpers.rb
@@ -62,8 +62,7 @@ module API
end
def log_user_activity(actor)
- commands = Gitlab::GitAccess::DOWNLOAD_COMMANDS +
- Gitlab::GitAccess::GIT_ANNEX_COMMANDS
+ commands = Gitlab::GitAccess::DOWNLOAD_COMMANDS
::Users::ActivityService.new(actor, 'Git SSH').execute if commands.include?(params[:action])
end
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index d374d183dcd..5b48ee8665f 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -15,16 +15,6 @@ module API
# project - project path with namespace
# action - git action (git-upload-pack or git-receive-pack)
# changes - changes as "oldrev newrev ref", see Gitlab::ChangesList
- helpers do
- def log_user_activity(actor)
- commands = Gitlab::GitAccess::DOWNLOAD_COMMANDS +
- Gitlab::GitAccess::PUSH_COMMANDS +
- Gitlab::GitAccess::GIT_ANNEX_COMMANDS
-
- ::Users::ActivityService.new(actor, 'Git SSH').execute if commands.include?(params[:action])
- end
- end
-
post "/allowed" do
status 200
diff --git a/lib/api/users.rb b/lib/api/users.rb
index bcfbd9ab3c5..9e0faff6c05 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -535,7 +535,6 @@ module API
current_user.update_secondary_emails!
end
-
desc 'Get a list of user activities'
params do
optional :from, type: DateTime, default: 6.months.ago, desc: 'Date string in the format YEAR-MONTH-DAY'