Commit c1fc29e1 authored by Jeroen van Baarsen's avatar Jeroen van Baarsen

Merge branch 'commit_calendar_branches' into 'master'

Count commits in branches as well in the commit calendar

This MR fixes a small bug in the commit calendar.
Currently only commits that are in the master branch are counted.
With this change, commits in other branches are included as well.

fixes one of the issues found in #1162

See merge request !362
parents abc69c89 10212c01
...@@ -146,7 +146,7 @@ class Repository ...@@ -146,7 +146,7 @@ class Repository
end end
def timestamps_by_user_log(user) def timestamps_by_user_log(user)
args = %W(git log --author=#{user.email} --since=#{(Date.today - 1.year).to_s} --pretty=format:%cd --date=short) args = %W(git log --author=#{user.email} --since=#{(Date.today - 1.year).to_s} --branches --pretty=format:%cd --date=short)
dates = Gitlab::Popen.popen(args, path_to_repo).first.split("\n") dates = Gitlab::Popen.popen(args, path_to_repo).first.split("\n")
if dates.present? if dates.present?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment