diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-25 21:08:32 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-25 21:08:32 +0000 |
| commit | aadc5da1b1ccba52944e6df0f2173fad5d3fe675 (patch) | |
| tree | 3b43f157e9117be6713fc0c79014878e06308c6e /app/views/projects/commits | |
| parent | 0599ea8fb389d70cab67a78e80d61eadc6aeaaff (diff) | |
| download | gitlab-ce-aadc5da1b1ccba52944e6df0f2173fad5d3fe675.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/commits')
| -rw-r--r-- | app/views/projects/commits/show.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml index e5be3a897a5..4007b657403 100644 --- a/app/views/projects/commits/show.html.haml +++ b/app/views/projects/commits/show.html.haml @@ -18,9 +18,10 @@ - if @merge_request.present? .control.d-none.d-md-block = link_to _("View open merge request"), project_merge_request_path(@project, @merge_request), class: 'btn gl-button' - - elsif create_mr_button?(from: @repository.root_ref, to: @ref, source_project: @project, target_project: @project) + - elsif create_mr_button?(from: @ref, source_project: @project) .control.d-none.d-md-block - = link_to _("Create merge request"), create_mr_path(from: @repository.root_ref, to: @ref, source_project: @project, target_project: @project), class: 'btn gl-button btn-confirm' + = render Pajamas::ButtonComponent.new(variant: :confirm, href: create_mr_path(from: @ref, source_project: @project)) do + = _("Create merge request") .control = form_tag(project_commits_path(@project, @id), method: :get, class: 'commits-search-form js-signature-container', data: { 'signatures-path' => namespace_project_signatures_path }) do |