diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-11 12:07:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-11 12:07:59 +0300 |
| commit | 27ad9b4c89456548d3eaa380a8ab7cc7380f34c3 (patch) | |
| tree | f88951664b3ca62d5288d0c01d14da4e667981f1 /app/views/projects/commits | |
| parent | 134681224f2caef1404bf0ec2712bb7d86df7532 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/commits')
| -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 9e0dd93c683..4837f829568 100644 --- a/app/views/projects/commits/_commits.html.haml +++ b/app/views/projects/commits/_commits.html.haml @@ -22,7 +22,7 @@ - if context_commits.present? %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 + - if can_update_merge_request %button.gl-button.btn.btn-default.ml-3.add-review-item-modal-trigger{ type: "button", data: { context_commits_empty: 'false' } } = _('Add/remove') @@ -40,7 +40,7 @@ .gl-alert-content = 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? +- if can_update_merge_request && context_commits&.empty? %button.gl-button.btn.btn-default.mt-3.add-review-item-modal-trigger{ type: "button", data: { context_commits_empty: 'true' } } = _('Add previously merged commits') |