merge request show page refactored

This commit is contained in:
Dmitriy Zaporozhets 2011-12-13 20:40:45 +02:00 committed by Dmitriy Zaporozhets
parent e4bd6442a9
commit 3a50b6cac9
9 changed files with 105 additions and 52 deletions

View file

@ -30,14 +30,11 @@ class MergeRequestsController < ApplicationController
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
@diffs = @merge_request.diffs
@commit = @merge_request.last_commit
render :template => "merge_requests/_diffs", :layout => false
end
def new