From: Tom Hughes <tom@compton.nu>
Date: Sun, 4 Jun 2017 21:44:31 +0000 (+0100)
Subject: Replace render :nothing with non-deprecated alternatives
X-Git-Tag: live~3470
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9dafeda080b55efd19431da1e6689888faf07678?hp=339d8e46ff1d5d58beb1d66e5be842b63bf858f6

Replace render :nothing with non-deprecated alternatives
---

diff --git a/app/controllers/old_controller.rb b/app/controllers/old_controller.rb
index f41a94a33..16f1083de 100644
--- a/app/controllers/old_controller.rb
+++ b/app/controllers/old_controller.rb
@@ -64,7 +64,7 @@ class OldController < ApplicationController
     end
 
     # just return an empty 200 OK for success
-    render :nothing => true
+    head :ok
   end
 
   private
diff --git a/app/controllers/user_preference_controller.rb b/app/controllers/user_preference_controller.rb
index b59289792..dd4ea8bb1 100644
--- a/app/controllers/user_preference_controller.rb
+++ b/app/controllers/user_preference_controller.rb
@@ -57,7 +57,7 @@ class UserPreferenceController < ApplicationController
 
     new_preferences.each_value(&:save!)
 
-    render :nothing => true, :content_type => "text/plain"
+    render :plain => ""
   end
 
   ##
@@ -74,7 +74,7 @@ class UserPreferenceController < ApplicationController
     pref.v = request.raw_post.chomp
     pref.save!
 
-    render :nothing => true, :content_type => "text/plain"
+    render :plain => ""
   end
 
   ##
@@ -82,6 +82,6 @@ class UserPreferenceController < ApplicationController
   def delete_one
     UserPreference.find([@user.id, params[:preference_key]]).delete
 
-    render :nothing => true, :content_type => "text/plain"
+    render :plain => ""
   end
 end