diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-09-06 18:35:27 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-09-07 10:24:48 +0300 |
| commit | ffdfdc27e5f7d72f7ed48ece2dc06154e0c5b49e (patch) | |
| tree | 10a2dd20cbe9d4884ad98726df88e7846ec650e6 | |
| parent | a449124a76c783f619c4b57e0c8380cdb3bb5c4c (diff) | |
| download | gitlab-ce-ffdfdc27e5f7d72f7ed48ece2dc06154e0c5b49e.tar.gz | |
Expand abbreviations in merge request version path helper
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_versions.html.haml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 1379180cb6e..08ceaf9b4ca 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -101,7 +101,7 @@ module MergeRequestsHelper return 'hidden' if merge_request.closed? == closed || (merge_request.merged? == closed && !merge_request.closed?) || merge_request.closed_without_fork? end - def mr_version_path(project, merge_request, merge_request_diff, start_sha = nil) + def merge_request_version_path(project, merge_request, merge_request_diff, start_sha = nil) diffs_namespace_project_merge_request_path( project.namespace, project, merge_request, diff_id: merge_request_diff.id, start_sha: start_sha) diff --git a/app/views/projects/merge_requests/show/_versions.html.haml b/app/views/projects/merge_requests/show/_versions.html.haml index aa45a6cb18b..894736247e7 100644 --- a/app/views/projects/merge_requests/show/_versions.html.haml +++ b/app/views/projects/merge_requests/show/_versions.html.haml @@ -11,7 +11,7 @@ %ul.dropdown-menu.dropdown-menu-selectable - @merge_request_diffs.each_with_index do |merge_request_diff, i| %li - = link_to mr_version_path(@project, @merge_request, merge_request_diff), class: ('is-active' if merge_request_diff == @merge_request_diff) do + = link_to merge_request_version_path(@project, @merge_request, merge_request_diff), class: ('is-active' if merge_request_diff == @merge_request_diff) do %strong.monospace - if i.zero? Latest: @@ -38,14 +38,14 @@ %ul.dropdown-menu.dropdown-menu-selectable - @comparable_diffs.each_with_index do |merge_request_diff, i| %li - = link_to mr_version_path(@project, @merge_request, @merge_request_diff, merge_request_diff.head_commit_sha), class: ('is-active' if merge_request_diff.head_commit_sha == @start_sha) do + = link_to merge_request_version_path(@project, @merge_request, @merge_request_diff, merge_request_diff.head_commit_sha), class: ('is-active' if merge_request_diff.head_commit_sha == @start_sha) do %strong.monospace #{@comparable_diffs.size - i}. #{short_sha(merge_request_diff.head_commit_sha)} %br %small = time_ago_with_tooltip(merge_request_diff.created_at) %li - = link_to mr_version_path(@project, @merge_request, @merge_request_diff), class: ('is-active' unless @start_sha) do + = link_to merge_request_version_path(@project, @merge_request, @merge_request_diff), class: ('is-active' unless @start_sha) do %strong.monospace Base: #{short_sha(@merge_request_diff.base_commit_sha)} |