Commit bd5c59bb00df3821cc256201e1a6998b28bb6608
- Date: Thu Apr 10 07:49:09 +0000 2008
- Committer: Johan Sørensen (johan@johansorensen.com)
- Author: Johan Sørensen (johan@johansorensen.com)
- Commit SHA1: bd5c59bb00df3821cc256201e1a6998b28bb6608
- Tree SHA1: ee11aee6943b3546daa42b0c12ee66e1a3da5f20
Merge commit 'dysinger/merge-request-bug'
Commit diff
| | |
| 15 | 15 | def show |
| 16 | 16 | @merge_request = @repository.merge_requests.find(params[:id]) |
| 17 | 17 | @commits = @merge_request.target_repository.git.commit_deltas_from( |
| 18 | | @merge_request.source_repository.git, @merge_request.source_branch, @merge_request.target_branch) |
| 18 | @merge_request.source_repository.git, |
| 19 | @merge_request.target_branch, |
| 20 | @merge_request.source_branch |
| 21 | ) |
| 19 | 22 | end |
| 20 | 23 | |
| 21 | 24 | def new |
| toggle raw diff |
--- a/app/controllers/merge_requests_controller.rb
+++ b/app/controllers/merge_requests_controller.rb
@@ -15,7 +15,10 @@ class MergeRequestsController < ApplicationController
def show
@merge_request = @repository.merge_requests.find(params[:id])
@commits = @merge_request.target_repository.git.commit_deltas_from(
- @merge_request.source_repository.git, @merge_request.source_branch, @merge_request.target_branch)
+ @merge_request.source_repository.git,
+ @merge_request.target_branch,
+ @merge_request.source_branch
+ )
end
def new |
| | |
| 59 | 59 | src_repo = mock("src repo") |
| 60 | 60 | @merge_request.source_repository.stub!(:git).and_return(src_repo) |
| 61 | 61 | |
| 62 | | target_repo.should_receive(:commit_deltas_from).with(src_repo, "master", "master").and_return(commits) |
| 62 | target_repo.should_receive(:commit_deltas_from).with( |
| 63 | src_repo, @merge_request.target_branch, @merge_request.source_branch |
| 64 | ).and_return(commits) |
| 63 | 65 | |
| 64 | 66 | do_get |
| 65 | 67 | assigns[:commits].should == commits |
| toggle raw diff |
--- a/spec/controllers/merge_requests_controller_spec.rb
+++ b/spec/controllers/merge_requests_controller_spec.rb
@@ -59,7 +59,9 @@ describe MergeRequestsController do
src_repo = mock("src repo")
@merge_request.source_repository.stub!(:git).and_return(src_repo)
- target_repo.should_receive(:commit_deltas_from).with(src_repo, "master", "master").and_return(commits)
+ target_repo.should_receive(:commit_deltas_from).with(
+ src_repo, @merge_request.target_branch, @merge_request.source_branch
+ ).and_return(commits)
do_get
assigns[:commits].should == commits |
