diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-02-10 10:47:59 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-02-10 10:47:59 -0200 |
| commit | 202bf71da8e8f5ab0da0bc12b62084ed814ae1d9 (patch) | |
| tree | d574218e42085e1fd79cf650a3bfe928141fff7f | |
| parent | 1353cff5fed083fd7192dddff5062ac383b1f8a0 (diff) | |
| download | gitlab-ce-display-mr-link-if-thre-is-one.tar.gz | |
Change MR link to "View Open Merge Request"display-mr-link-if-thre-is-one
| -rw-r--r-- | app/views/projects/commits/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/compare/_form.html.haml | 2 | ||||
| -rw-r--r-- | features/steps/project/commits/commits.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml index 89e091203a3..c52cf25d40a 100644 --- a/app/views/projects/commits/show.html.haml +++ b/app/views/projects/commits/show.html.haml @@ -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 diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml index bdaa39055ad..4ab81f3635c 100644 --- a/app/views/projects/compare/_form.html.haml +++ b/app/views/projects/compare/_form.html.haml @@ -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") diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb index 23814c2ee25..f9fd7332464 100644 --- a/features/steps/project/commits/commits.rb +++ b/features/steps/project/commits/commits.rb @@ -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 |