diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-10-09 13:30:15 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-10-09 13:30:15 +0000 |
| commit | 5d865bccecfb21854afd5c9b71ba67f007e11f09 (patch) | |
| tree | 536450414f0679f2631ef2d7ca22d0973178c3c6 | |
| parent | f277fa14094e5515e2317d2baa1fa0bfb95966da (diff) | |
| parent | 9137114355ddd36c72d0847e23b3bc66acde1a1e (diff) | |
| download | gitlab-ce-5d865bccecfb21854afd5c9b71ba67f007e11f09.tar.gz | |
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
| -rw-r--r-- | app/views/events/event/_push.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/37483-activity-log-show-wrong-number-of-commits-per-push.yml | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index 53ebdd6d2ff..9a763887b30 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -19,8 +19,7 @@ - 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 %li.commits-stat - - if event.commits_count > 2 - %span ... and #{event.commits_count - 2} more commits. + %span ... and #{pluralize(event.commits_count - 1, 'more commit')}. - if event.md_ref? - from = event.commit_from diff --git a/changelogs/unreleased/37483-activity-log-show-wrong-number-of-commits-per-push.yml b/changelogs/unreleased/37483-activity-log-show-wrong-number-of-commits-per-push.yml new file mode 100644 index 00000000000..225ab9acc44 --- /dev/null +++ b/changelogs/unreleased/37483-activity-log-show-wrong-number-of-commits-per-push.yml @@ -0,0 +1,5 @@ +--- +title: Fix the number representing the amount of commits related to a push event +merge_request: +author: +type: fixed |