diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-09 18:07:50 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-09 18:07:50 +0000 |
| commit | 20f6a17ba2d2d5f056bda38dfe85e2a7b2a82d0b (patch) | |
| tree | 1319f393750fa7a212455746273c05465d786fde /app/views/projects/merge_requests | |
| parent | e38a99eb0725697297386dd0bb1045b1fd55493a (diff) | |
| download | gitlab-ce-20f6a17ba2d2d5f056bda38dfe85e2a7b2a82d0b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/_commits.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_commits.html.haml b/app/views/projects/merge_requests/_commits.html.haml index 7cadc37b0fd..ee0ab984d6f 100644 --- a/app/views/projects/merge_requests/_commits.html.haml +++ b/app/views/projects/merge_requests/_commits.html.haml @@ -13,6 +13,9 @@ - else %ol#commits-list.list-unstyled = render "projects/commits/commits", merge_request: @merge_request + - if @next_page && @merge_request + = render Pajamas::ButtonComponent.new(button_options: { class: 'js-load-more-commits', data: { next_page: @next_page } }) do + = _('Load more') -- if can_update_merge_request && @merge_request.iid +- if can_update_merge_request && @merge_request.iid && !@next_page .add-review-item-modal-wrapper{ data: { context_commits_path: context_commits_project_json_merge_request_url(@merge_request&.project, @merge_request, :json), target_branch: @merge_request.target_branch, merge_request_iid: @merge_request.iid, project_id: @merge_request.project.id } } |