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

Persist Merge Request diff. Auto merge request close on push

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-15 00:57:43 +02:00
parent 27e3699814
commit 5a3f23f395
10 changed files with 121 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/controllers/merge_requests_controller.rb
View file

@ -41,13 +41,12 @@ class MergeRequestsController < ApplicationController
@note = @project.notes.new(:noteable => @merge_request)
@commits = @project.repo.
commits_between(@merge_request.target_branch, @merge_request.source_branch).
map {|c| Commit.new(c)}.
sort_by(&:created_at).
reverse
# Get commits from repository
# or from cache if already merged
@commits = @merge_request.commits
render_full_content
# Close MR if nothing to merge
#@merge_request.mark_as_merged! if @merge_request.probably_merged?
respond_to do |format|
format.html
@ -76,6 +75,8 @@ class MergeRequestsController < ApplicationController
respond_to do |format|
if @merge_request.save
@merge_request.reloaded_commits
@merge_request.reloaded_diffs
format.html { redirect_to [@project, @merge_request], notice: 'Merge request was successfully created.' }
format.json { render json: @merge_request, status: :created, location: @merge_request }
else