Fix some tests for changes in rails 5

[rails.git] / app / controllers / changeset_controller.rb

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 71fc2a59a58659e5cc37efc3169f77891a57f04d..e80eb16105e2b0938462b060b934e5cb9d46ef53 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -61,7 +61,7 @@ class ChangesetController < ApplicationController
     changeset.set_closed_time_now
 
     changeset.save!
-    render :nothing => true
+    head :ok
   end
 
   ##
@@ -244,7 +244,7 @@ class ChangesetController < ApplicationController
 
     check_changeset_consistency(changeset, @user)
     changeset.update_from(new_changeset, @user)
-    render :xml => changeset.to_xml
+    render :xml => changeset.to_xml.to_s
   end
 
   ##