summaryrefslogtreecommitdiff
path: root/app/controllers/admin/abuse_reports_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-18 12:48:23 -0500
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-18 12:48:23 -0500
commit253a017b0173ae12d83dc4c6976f1b0a838448a6 (patch)
treef19de62135aac3aa12f0e4998516c3be4007ea77 /app/controllers/admin/abuse_reports_controller.rb
parent4ade5ff42511d7931bebb28098c2dc2192caba3e (diff)
parent6a0ea605e8b48deacbb4e93f7bb1d9b9abd2f7f4 (diff)
downloadgitlab-ce-253a017b0173ae12d83dc4c6976f1b0a838448a6.tar.gz
Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/admin/abuse_reports_controller.rb')
-rw-r--r--app/controllers/admin/abuse_reports_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/abuse_reports_controller.rb b/app/controllers/admin/abuse_reports_controller.rb
index e9b0972bdd8..5055c318a5f 100644
--- a/app/controllers/admin/abuse_reports_controller.rb
+++ b/app/controllers/admin/abuse_reports_controller.rb
@@ -9,6 +9,6 @@ class Admin::AbuseReportsController < Admin::ApplicationController
abuse_report.remove_user(deleted_by: current_user) if params[:remove_user]
abuse_report.destroy
- render nothing: true
+ head :ok
end
end