Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Rosenögger <Hannes.Rosenoegger@bva.bund.de>2015-03-03 17:31:05 +0300
committerHannes Rosenögger <Hannes.Rosenoegger@bva.bund.de>2015-03-03 17:31:05 +0300
commit10212c01fd18aa9961e86bd961475068a7596f00 (patch)
treea946b501497f71af43f7283a670cb13006475b87 /app/models/repository.rb
parent2f4656b5c7e2a9b351237432e76a7b928a1684b1 (diff)
Count commits in branches as well in the commit calendar
Diffstat (limited to 'app/models/repository.rb')
-rw-r--r--app/models/repository.rb2
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?