Merge branch 'rails5-deprecation-render-nothing' into 'master'

Rails5 deprecation: :nothing option is deprecated, Use head method to respond with empty response body.

See merge request gitlab-org/gitlab-ce!23311

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
 

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

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

changelogs/unreleased/rails5-deprecation-render-nothing.yml

+---
+title: render :nothing option is deprecated, Use head method to respond with empty
+  response body.
+merge_request: 23311
+author: Jasper Maes
+type: other

spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb

@@ -27,11 +27,11 @@ describe ControllerWithCrossProjectAccessCheck do
                                               if: -> { if_condition }
 
         def index
-          render nothing: true
+          head :ok
         end
 
         def show
-          render nothing: true
+          head :ok
         end
 
         def unless_condition
@@ -88,15 +88,15 @@ describe ControllerWithCrossProjectAccessCheck do
                                         if: -> { if_condition }
 
         def index
-          render nothing: true
+          head :ok
         end
 
         def show
-          render nothing: true
+          head :ok
         end
 
         def edit
-          render nothing: true
+          head :ok
         end
 
         def unless_condition

spec/controllers/concerns/lfs_request_spec.rb

@@ -10,7 +10,7 @@ describe LfsRequest do
     def show
       storage_project
 
-      render nothing: true
+      head :ok
     end
 
     def project