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

Merge pull request #2067 from riyad/diff-and-patch-for-commits-and-merge-requests

Browse source 
Diff and patch for commits and merge requests
This commit is contained in:
Dmitriy Zaporozhets 2012-11-26 04:40:49 -08:00
commit e750efd9fc
14 changed files with 238 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/commit_controller.rb
View file

@ -26,7 +26,8 @@ class CommitController < ProjectResourceController
end
end
format.patch
format.diff { render text: @commit.to_diff }
format.patch { render text: @commit.to_patch }
end
end
end

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