Change MR link to "View Open Merge Request"
This commit is contained in:
parent
1353cff5fe
commit
202bf71da8
|
@ -13,7 +13,7 @@
|
|||
.block-controls.hidden-xs.hidden-sm
|
||||
- if @merge_request.present?
|
||||
.control
|
||||
= link_to "View #{@merge_request.to_reference}", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn btn-success'
|
||||
= link_to "View Open Merge Request", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn'
|
||||
- elsif create_mr_button?(@repository.root_ref, @ref)
|
||||
.control
|
||||
= link_to create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success' do
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
= button_tag "Compare", class: "btn btn-create commits-compare-btn"
|
||||
- if @merge_request.present?
|
||||
= link_to "View #{@merge_request.to_reference}", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'prepend-left-10 btn'
|
||||
= link_to "View Open Merge Request", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'prepend-left-10 btn'
|
||||
- elsif create_mr_button?
|
||||
= link_to create_mr_path, class: 'prepend-left-10 btn' do
|
||||
= icon("plus")
|
||||
|
|
|
@ -110,7 +110,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
|
|||
|
||||
step 'I should see button to the merge request' do
|
||||
merge_request = MergeRequest.find_by(title: 'Feature')
|
||||
expect(page).to have_link "View #{merge_request.to_reference}", href: namespace_project_merge_request_path(@project.namespace, @project, merge_request)
|
||||
expect(page).to have_link "View Open Merge Request", href: namespace_project_merge_request_path(@project.namespace, @project, merge_request)
|
||||
end
|
||||
|
||||
step 'I see breadcrumb links' do
|
||||
|
|
Loading…
Reference in New Issue