Merge remote-tracking branch 'upstream/pull/2164'

[rails.git] / app / controllers / api / changesets_controller.rb

diff --git a/app/controllers/api/changesets_controller.rb b/app/controllers/api/changesets_controller.rb
index 92690a75ec36f671a8ee34178899b4d7c74e98a8..dd43f7ed0943e59829d3902ee2142717eb200bb8 100644 (file)
--- a/app/controllers/api/changesets_controller.rb
+++ b/app/controllers/api/changesets_controller.rb
@@ -43,7 +43,7 @@ module Api
     def show
       @changeset = Changeset.find(params[:id])
       @include_discussion = params[:include_discussion].presence
     def show
       @changeset = Changeset.find(params[:id])
       @include_discussion = params[:include_discussion].presence

-      render "changesets/changeset"
+      render "changeset"

     end
 
     ##
     end
 
     ##


@@ -105,7 +105,7 @@ module Api
       # will include the bigger bounding box.
       cs.save!
       @changeset = cs
       # will include the bigger bounding box.
       cs.save!
       @changeset = cs

-      render "changesets/changeset"
+      render "changeset"

     end
 
     ##
     end
 
     ##


@@ -222,7 +222,7 @@ module Api
 
       # preload users, tags and comments, and render result
       @changesets = changesets.preload(:user, :changeset_tags, :comments)
 
       # preload users, tags and comments, and render result
       @changesets = changesets.preload(:user, :changeset_tags, :comments)

-      render "changesets/changesets"
+      render "changesets"

     end
 
     ##
     end
 
     ##


@@ -242,7 +242,7 @@ module Api
 
       check_changeset_consistency(@changeset, current_user)
       @changeset.update_from(new_changeset, current_user)
 
       check_changeset_consistency(@changeset, current_user)
       @changeset.update_from(new_changeset, current_user)

-      render "changesets/changeset"
+      render "changeset"

     end
 
     ##
     end
 
     ##


@@ -263,7 +263,7 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = changeset
 
       # Return a copy of the updated changeset
       @changeset = changeset

-      render "changesets/changeset"
+      render "changeset"

     end
 
     ##
     end
 
     ##


@@ -284,7 +284,7 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = changeset
 
       # Return a copy of the updated changeset
       @changeset = changeset

-      render "changesets/changeset"
+      render "changeset"

     end
 
     private
     end
 
     private