deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/merge_requests_controller.rb
View file

@ -1,7 +1,7 @@
class MergeRequestsController < ProjectResourceController
before_filter :module_enabled
before_filter :merge_request, only: [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check, :raw]
before_filter :validates_merge_request, only: [:show, :diffs, :raw]
before_filter :merge_request, only: [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check]
before_filter :validates_merge_request, only: [:show, :diffs]
before_filter :define_show_vars, only: [:show, :diffs]
# Allow read any merge_request
@ -16,7 +16,6 @@ class MergeRequestsController < ProjectResourceController
# Allow destroy merge_request
before_filter :authorize_admin_merge_request!, only: [:destroy]
def index
@merge_requests = MergeRequestsLoadContext.new(project, current_user, params).execute
end
@ -25,11 +24,10 @@ class MergeRequestsController < ProjectResourceController
respond_to do |format|
format.html
format.js
end
end
def raw
send_file @merge_request.to_raw
format.diff { render text: @merge_request.to_diff }
format.patch { render text: @merge_request.to_patch }
end
end
def diffs