Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
cfc6fe5100
commit
ad28c03c2a
|
@ -4,22 +4,21 @@
|
||||||
|
|
||||||
- commits = @commits
|
- commits = @commits
|
||||||
- hidden = @hidden_commit_count
|
- hidden = @hidden_commit_count
|
||||||
- commits_count = @commits.size
|
|
||||||
|
|
||||||
- commits.chunk { |c| c.committed_date.in_time_zone.to_date }.each do |day, commits|
|
- commits.chunk { |c| c.committed_date.in_time_zone.to_date }.each do |day, daily_commits|
|
||||||
%li.commit-header.js-commit-header{ data: { day: day } }
|
%li.commit-header.js-commit-header{ data: { day: day } }
|
||||||
%span.day= l(day, format: '%d %b, %Y')
|
%span.day= l(day, format: '%d %b, %Y')
|
||||||
%span.commits-count= n_("%d commit", "%d commits", commits_count) % commits_count
|
%span.commits-count= n_("%d commit", "%d commits", daily_commits.size) % daily_commits.size
|
||||||
|
|
||||||
%li.commits-row{ data: { day: day } }
|
%li.commits-row{ data: { day: day } }
|
||||||
%ul.content-list.commit-list.flex-list
|
%ul.content-list.commit-list.flex-list
|
||||||
= render partial: 'projects/commits/commit', collection: commits, locals: { project: project, ref: ref, merge_request: merge_request }
|
= render partial: 'projects/commits/commit', collection: daily_commits, locals: { project: project, ref: ref, merge_request: merge_request }
|
||||||
|
|
||||||
- if hidden > 0
|
- if hidden > 0
|
||||||
%li.alert.alert-warning
|
%li.alert.alert-warning
|
||||||
= n_('%s additional commit has been omitted to prevent performance issues.', '%s additional commits have been omitted to prevent performance issues.', hidden) % number_with_delimiter(hidden)
|
= n_('%s additional commit has been omitted to prevent performance issues.', '%s additional commits have been omitted to prevent performance issues.', hidden) % number_with_delimiter(hidden)
|
||||||
|
|
||||||
- if commits_count == 0
|
- if commits.size == 0
|
||||||
.mt-4.text-center
|
.mt-4.text-center
|
||||||
.bold
|
.bold
|
||||||
= _('Your search didn\'t match any commits.')
|
= _('Your search didn\'t match any commits.')
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Fix incorrect commits number in commits list
|
||||||
|
merge_request: 30412
|
||||||
|
author:
|
||||||
|
type: fixed
|
|
@ -135,3 +135,6 @@ those variables:
|
||||||
```shell
|
```shell
|
||||||
docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY
|
docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY
|
||||||
```
|
```
|
||||||
|
|
||||||
|
NOTE: **Note:**
|
||||||
|
The special handling for the `gitlab-deploy-token` deploy token is not currently implemented for group deploy tokens. For the deploy token to be available for CI/CD jobs, it must be created at the project level. See [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/214014) for details.
|
||||||
|
|
|
@ -19766,6 +19766,12 @@ msgstr ""
|
||||||
msgid "StatusPage|Status page"
|
msgid "StatusPage|Status page"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "StatusPage|Status page URL"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "StatusPage|Status page frontend documentation"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "StatusPage|To publish incidents to an external status page, GitLab will store a JSON file in your Amazon S3 account in a location accessible to your external status page service. Make sure to also set up %{docsLink}"
|
msgid "StatusPage|To publish incidents to an external status page, GitLab will store a JSON file in your Amazon S3 account in a location accessible to your external status page service. Make sure to also set up %{docsLink}"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue