Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Maes <jaspermaes.jm@gmail.com>2018-11-22 20:47:29 +0300
committerJasper Maes <jaspermaes.jm@gmail.com>2018-11-23 12:56:14 +0300
commit6ffdab63c5ad0b255b0ab605ff97fb93bee6465d (patch)
treef7ead28311a7630d777ab6d86fe4f91560a8590b /app/controllers/projects/merge_requests_controller.rb
parent0a42c7cbaae51466a67a4011859726c29bc24da4 (diff)
render :nothing option is deprecated, Use head method to respond with empty response body.
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
-rw-r--r--app/controllers/projects/merge_requests_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 23d16fed7b9..d521db79f85 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -213,7 +213,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
def rebase
RebaseWorker.perform_async(@merge_request.id, current_user.id)
- render nothing: true, status: :ok
+ head :ok
end
protected