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

merge request: notes, diffs, commits

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2011-11-28 22:16:57 +02:00
parent c0e5bc5ee8
commit 8803fbb593
8 changed files with 120 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/controllers/merge_requests_controller.rb
View file

@ -1,7 +1,7 @@
class MergeRequestsController < ApplicationController
before_filter :authenticate_user!
before_filter :project
before_filter :merge_request, :only => [:edit, :update, :destroy, :show]
before_filter :merge_request, :only => [:edit, :update, :destroy, :show, :commits, :diffs]
layout "project"
# Authorize
@ -19,7 +19,24 @@ class MergeRequestsController < ApplicationController
head(404)and return
end
@notes = @merge_request.notes.inc_author.order("created_at DESC").limit(20)
@note = @project.notes.new(:noteable => @merge_request)
respond_to do |format|
format.html
format.js { respond_with_notes }
end
end
def commits
@commits = @project.repo.commits_between(@merge_request.target_branch, @merge_request.source_branch).map {|c| Commit.new(c)}
render :template => "merge_requests/_commits", :layout => false
end
def diffs
@commit = @project.commit(@merge_request.source_branch)
@diffs = @project.repo.diff(@merge_request.target_branch, @merge_request.source_branch)
render :template => "merge_requests/_diffs", :layout => false
end
def new