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

Tabs styled. MR Get Patch

Browse source
This commit is contained in:
randx 2012-07-05 01:26:23 +03:00
parent 3ce629fded
commit 264ee0c5a1
6 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/merge_requests_controller.rb
View file

@ -2,8 +2,8 @@ class MergeRequestsController < ApplicationController
before_filter :authenticate_user!
before_filter :project
before_filter :module_enabled
before_filter :merge_request, :only => [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check]
before_filter :validates_merge_request, :only => [:show, :diffs]
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 :define_show_vars, :only => [:show, :diffs]
layout "project"
@ -43,6 +43,10 @@ class MergeRequestsController < ApplicationController
end
end
def raw
send_file @merge_request.to_raw
end
def diffs
@diffs = @merge_request.diffs
@commit = @merge_request.last_commit