summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-07 21:09:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-07 21:09:46 +0000
commit6867eff1f997a881cd3ea64109f7ba2d4b42fde4 (patch)
treea0d4b0ced920ff41311e578b406ed9a7136e8f42 /lib/api
parent3290d46655f07d7ae3dca788d6df9f326972ffd8 (diff)
downloadgitlab-ce-6867eff1f997a881cd3ea64109f7ba2d4b42fde4.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/api.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 51fc006ec08..cf6e7f18a5f 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -105,7 +105,7 @@ module API
namespace do
after do
- ::Users::ActivityService.new(@current_user).execute if Feature.enabled?(:api_activity_logging)
+ ::Users::ActivityService.new(@current_user).execute
end
# Keep in alphabetical order