diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-03-03 15:53:02 +0000 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-03-03 15:53:02 +0000 |
| commit | c1fc29e1f8c1a309f2125655b64d125bf61ea79d (patch) | |
| tree | 64204a0d76d4567ddc20ba32922b431d0bbdb9f4 | |
| parent | abc69c890513fb58c1ceae7548f4fbcc221b7c34 (diff) | |
| parent | 10212c01fd18aa9961e86bd961475068a7596f00 (diff) | |
| download | gitlab-ce-c1fc29e1f8c1a309f2125655b64d125bf61ea79d.tar.gz | |
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
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index bbf35f04bbc..5b52739df2b 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -146,7 +146,7 @@ class Repository end 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") if dates.present? |