From 5d1ad32eb8f59992354d37249b23cbb528c48691 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 3 Jul 2019 10:49:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/tiding.rb | 2 +- app/services/games_service.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/tiding.rb b/app/models/tiding.rb index c5b2e6a3..5107374e 100644 --- a/app/models/tiding.rb +++ b/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 diff --git a/app/services/games_service.rb b/app/services/games_service.rb index 8589023a..7cfe9107 100644 --- a/app/services/games_service.rb +++ b/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}",