Merge branch 'master' of github.com:discourse/discourse

app/controllers/draft_controller.rb

@@ -9,12 +9,12 @@ class DraftController < ApplicationController
 
   def update
     Draft.set(current_user, params[:draft_key], params[:sequence].to_i, params[:data])
-    render text: 'ok'
+    render json: success_json
   end
 
   def destroy
     Draft.clear(current_user, params[:draft_key], params[:sequence].to_i)
-    render text: 'ok'
+    render json: success_json
   end
 
 end

app/controllers/topics_controller.rb

@@ -329,8 +329,6 @@ class TopicsController < ApplicationController
     end
   end
 
-  private
-
   def move_posts_to_destination(topic)
     args = {}
     args[:title] = params[:title] if params[:title].present?