Commit 5d865bcc authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '37483-activity-log-show-wrong-number-of-commits-per-push' into 'master'

Fix the number representing the amount of commits related to a push event

Closes #37483

See merge request gitlab-org/gitlab-ce!14103
parents f277fa14 91371143
...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
- create_mr = event.new_ref? && create_mr_button?(project.default_branch, event.ref_name, project) && event.authored_by?(current_user) - create_mr = event.new_ref? && create_mr_button?(project.default_branch, event.ref_name, project) && event.authored_by?(current_user)
- if event.commits_count > 1 - if event.commits_count > 1
%li.commits-stat %li.commits-stat
- if event.commits_count > 2 %span ... and #{pluralize(event.commits_count - 1, 'more commit')}.
%span ... and #{event.commits_count - 2} more commits.
- if event.md_ref? - if event.md_ref?
- from = event.commit_from - from = event.commit_from
......
---
title: Fix the number representing the amount of commits related to a push event
merge_request:
author:
type: fixed
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