diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 14:36:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 14:36:54 +0000 |
| commit | f61bb2a16a514b71bf33aabbbb999d6732016a24 (patch) | |
| tree | 9548caa89e60b4f40b99bbd1dac030420b812aa8 /app/views/projects/commits/_commits.html.haml | |
| parent | 35fc54e5d261f8898e390aea7c2f5ec5fdf0539d (diff) | |
| download | gitlab-ce-4a647b2732a66bd1012cef18484571aacad42b5a.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc42
Diffstat (limited to 'app/views/projects/commits/_commits.html.haml')
| -rw-r--r-- | app/views/projects/commits/_commits.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml index a8a928515fe..9e2dca3ad71 100644 --- a/app/views/projects/commits/_commits.html.haml +++ b/app/views/projects/commits/_commits.html.haml @@ -20,7 +20,7 @@ %li.commit-header.js-commit-header %span.font-weight-bold= n_("%d previously merged commit", "%d previously merged commits", context_commits.count) % context_commits.count - if project.context_commits_enabled? && can_update_merge_request - %button.btn.btn-default.ml-3.add-review-item-modal-trigger{ type: "button", data: { context_commits_empty: 'false' } } + %button.gl-button.btn.btn-default.ml-3.add-review-item-modal-trigger{ type: "button", data: { context_commits_empty: 'false' } } = _('Add/remove') %li.commits-row @@ -33,7 +33,7 @@ = 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 project.context_commits_enabled? && can_update_merge_request && context_commits&.empty? - %button.btn.btn-default.mt-3.add-review-item-modal-trigger{ type: "button", data: { context_commits_empty: 'true' } } + %button.gl-button.btn.btn-default.mt-3.add-review-item-modal-trigger{ type: "button", data: { context_commits_empty: 'true' } } = _('Add previously merged commits') - if commits.size == 0 && context_commits.nil? |