diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-29 12:10:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-29 12:10:19 +0000 |
| commit | d15aa4cf2e1b1c55629f5b672366c5be40344aa5 (patch) | |
| tree | 0b974d69a2046854d2edb01bff5f7a0429969bf2 /app/controllers/users_controller.rb | |
| parent | 385d7ee6af36be869f681b368bd9c607b45cc4cd (diff) | |
| download | gitlab-ce-d15aa4cf2e1b1c55629f5b672366c5be40344aa5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/users_controller.rb')
| -rw-r--r-- | app/controllers/users_controller.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 46245286820..62208d838c1 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -33,10 +33,8 @@ class UsersController < ApplicationController end format.json do - # In 13.8, this endpoint will be removed: - # https://gitlab.com/gitlab-org/gitlab/-/issues/289972 - load_events - pager_json("events/_events", @events.count, events: @events) + msg = "This endpoint is deprecated. Use %s instead." % user_activity_path + render json: { message: msg }, status: :not_found end end end |