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

Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 

Conflicts:
	app/controllers/repositories_controller.rb
This commit is contained in:
huang 2015-07-25 12:05:14 +08:00
parent fbc0f074d4 405104c403
commit a8eb62b24e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/repository/git.rb
View File

@ -38,8 +38,8 @@ class Repository::Git < Repository
'Git' 'Git'
end end
def commits(authors, start_date, end_date) def commits(authors, start_date, end_date, branch='master')
scm.commits(authors, start_date, end_date).map {|commit| scm.commits(authors, start_date, end_date,branch).map {|commit|
[commit[:author], commit[:num]] [commit[:author], commit[:num]]
} }
end end

4
lib/redmine/scm/adapters/git_adapter.rb
View File

@ -396,10 +396,10 @@ module Redmine
sum[:insertion] + sum[:deletion] sum[:insertion] + sum[:deletion]
end end
def commits(authors, start_date, end_date) def commits(authors, start_date, end_date, branch='master')
rs = [] rs = []
authors.each do |author| authors.each do |author|
cmd_args = %W|log --pretty=tformat: --shortstat --author=#{author} --since=#{start_date} --until=#{end_date}| cmd_args = %W|log #{branch} --pretty=tformat: --shortstat --author=#{author} --since=#{start_date} --until=#{end_date}|
commits = '' commits = ''
git_cmd(cmd_args) do |io| git_cmd(cmd_args) do |io|
commits = io.read commits = io.read