Merge branch 'dev_aliyun' into dev_tj

merge aliyun

app/controllers/discusses_controller.rb

@@ -15,7 +15,7 @@ class DiscussesController < ApplicationController
       disscusses = Discuss.where(:dis_id => @container.id, :dis_type => @container.class.to_s,
                                              :root_id => nil)
       @discusses = disscusses.joins("left join games on discusses.challenge_id = games.challenge_id and discusses.user_id = games.user_id")
-                       .select("discusses.*, games.identifier").includes(:user, :praise_treads)
+                       .select("discusses.*, games.identifier").includes(:user, :praise_treads).limit(LIMIT).offset(offset)
     else
       disscusses = Discuss.where("dis_id = :dis_id and dis_type = :dis_type and root_id is null and
                                       (discusses.hidden = :hidden or discusses.user_id = :user_id)",