Remove merge_request#raw and replace it with formats to #show

Needed to add a constraint on the id. Otherwise the format was parsed as part of the id.
This commit is contained in:
Riyad Preukschas 2012-11-22 21:50:36 +01:00
parent ddb7399ac4
commit 2b1afa0e62
5 changed files with 17 additions and 18 deletions

View file

@ -1,8 +1,10 @@
- if @merge_request.valid_diffs?
= render "commits/diffs", diffs: @diffs
- elsif @merge_request.broken_diffs?
%h4.nothing_here_message
%h4.nothing_here_message
Can't load diff.
You can #{link_to "download MR patch", raw_project_merge_request_path(@project, @merge_request), class: "vlink"} instead.
You can
= link_to "download it", project_merge_request_path(@project, @merge_request), format: :diff, class: "vlink"
instead.
- else
%h4.nothing_here_message Nothing to merge

View file

@ -13,9 +13,9 @@
= "MERGED"
- if can?(current_user, :modify_merge_request, @merge_request)
- if @merge_request.open?
= link_to raw_project_merge_request_path(@project, @merge_request), class: "btn grouped" do
= link_to project_merge_request_path(@project, @merge_request, format: :patch), class: "btn grouped" do
%i.icon-download-alt
Get Patch
Get Patch
= link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped danger", title: "Close merge request"