diff options
author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-11-22 18:47:29 +0100 |
---|---|---|
committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-11-23 10:56:14 +0100 |
commit | 6ffdab63c5ad0b255b0ab605ff97fb93bee6465d (patch) | |
tree | f7ead28311a7630d777ab6d86fe4f91560a8590b /app/controllers | |
parent | 0a42c7cbaae51466a67a4011859726c29bc24da4 (diff) | |
download | gitlab-ce-6ffdab63c5ad0b255b0ab605ff97fb93bee6465d.tar.gz |
render :nothing option is deprecated, Use head method to respond with empty response body.
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/blob_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/projects/branches_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 2a6fe3b9c97..873c96a5523 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -233,7 +233,7 @@ class Projects::BlobController < Projects::ApplicationController def validate_diff_params if [:since, :to, :offset].any? { |key| params[key].blank? } - render nothing: true + head :ok end end diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index b7750f4517b..95a014d24da 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -105,7 +105,7 @@ class Projects::BranchesController < Projects::ApplicationController redirect_to project_branches_path(@project), status: :see_other end - format.js { render nothing: true, status: result[:return_code] } + format.js { head result[:return_code] } format.json { render json: { message: result[:message] }, status: result[:return_code] } end end 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 |