diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-16 15:07:32 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-16 15:07:32 +0000 |
| commit | db19df23733c768c564534a09de2e6718097ec95 (patch) | |
| tree | f148eb0723f20a2442e0274089d567e1810ee8d2 /app/views/projects/commits/_commits.html.haml | |
| parent | d2199d74936cd5cb9f45f569f723a5370ae5013e (diff) | |
| download | gitlab-ce-db19df23733c768c564534a09de2e6718097ec95.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/commits/_commits.html.haml')
| -rw-r--r-- | app/views/projects/commits/_commits.html.haml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml index 4837f829568..02b5fe00ad0 100644 --- a/app/views/projects/commits/_commits.html.haml +++ b/app/views/projects/commits/_commits.html.haml @@ -34,10 +34,11 @@ = render partial: 'projects/commits/commit', collection: context_commits, locals: { project: project, ref: ref, merge_request: merge_request } - if hidden > 0 - %li.gl-alert.gl-alert-warning - .gl-alert-container - = sprite_icon('warning', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') - .gl-alert-content + %li + = render 'shared/global_alert', + variant: :warning, + dismissible: false do + .gl-alert-body = 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 can_update_merge_request && context_commits&.empty? |