Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

app/models/message.rb

@@ -53,7 +53,7 @@ class Message < ActiveRecord::Base
   has_many :tidings, :as => :container , :dependent => :destroy
 
   belongs_to :reply, :class_name => 'Message', :foreign_key => 'reply_id'
-  has_one :message_detail, :dependent => :destroy
+  #has_one :message_detail, :dependent => :destroy
 
   #转发表
   has_many :forwards, :as => :from, :dependent => :destroy

app/models/tiding.rb

@@ -252,7 +252,7 @@ class Tiding < ActiveRecord::Base
         if self.tiding_type == "Mentioned"
           "@了你：" + message_content(container.notes)
         elsif self.tiding_type == "Comment"
-          "评论了你" + (container.parent.present? ? "的回复：" : "发布的项目issue：") + message_content(container.notes)
+          container.present? ? ("评论了你" + (container.parent.present? ? "的回复：" : "发布的项目issue：") + message_content(container.notes)) : ""
         else
           "更新了Issue：#{container.issue.subject}"
         end

app/services/games_service.rb

@@ -568,7 +568,6 @@ class GamesService
 
     testCases = Base64.urlsafe_encode64(testSet.to_json) unless testSet.blank?
 
-
     # 注意：这个地方的参数写的时候不能换行
     content_modified = params[:content_modified] # 决定文件内容是否有修改，有修改如果中间成pull没有更新，则轮询等待更新
     params = {:tpiID => "#{myshixun.id}", :tpiGitURL  => "#{gitUrl}", :buildID => "#{taskId}",:instanceChallenge  => "#{step}",