jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into dai_ao

This commit is contained in:
daiao 2016-11-25 17:55:27 +08:00
parent c640535cca 3c74bc7465
commit 581250cfea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/pull_requests_helper.rb
View File

@ -2,12 +2,12 @@ module PullRequestsHelper
# 获取diff内容行号 # 获取diff内容行号
def diff_line_num content def diff_line_num content
content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.nil? ? "" : content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i result = content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.nil? ? "" : content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i
end end
# 处理内容 # 处理内容
def diff_content content def diff_content content
content.gsub!(/.*@@ -\d+,\d+ \+\d+,\d+ @@\n/m,'') result = content.gsub!(/.*@@.*@@\n/m,'')
end end
def get_user_name user_id def get_user_name user_id