diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-15 19:18:52 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-15 19:18:52 +0200 |
| commit | fd522b32579bb37932ab3305870c285a0201dd55 (patch) | |
| tree | 5572d4ac73a46a387ba091d1c6aec1933215b116 /spec/controllers | |
| parent | cc54c66fd0e402743ce942c19040828e07d1da2f (diff) | |
| download | gitlab-ce-fd522b32579bb37932ab3305870c285a0201dd55.tar.gz | |
should be green build now :)
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/merge_requests_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/merge_requests_controller_spec.rb b/spec/controllers/merge_requests_controller_spec.rb index 8478bb3adff..37e36efc1ca 100644 --- a/spec/controllers/merge_requests_controller_spec.rb +++ b/spec/controllers/merge_requests_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe MergeRequestsController do let(:project) { create(:project) } let(:user) { create(:user) } - let(:merge_request) { create(:merge_request_with_diffs, project: project) } + let(:merge_request) { create(:merge_request_with_diffs, project: project, target_branch: "bcf03b5d~3", source_branch: "bcf03b5d") } before do sign_in(user) |