diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-07-17 08:23:16 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-07-17 08:23:16 +0300 |
| commit | 88033500232f12234a9546aa9b89111bcdbfecef (patch) | |
| tree | 2104132c2d8059027d79ad44b457cad5384ad53d /app/models/merge_request.rb | |
| parent | 494cd02b38eb2bfbeeb69dec0688a7a1e7ccf50f (diff) | |
| download | gitlab-ce-88033500232f12234a9546aa9b89111bcdbfecef.tar.gz | |
CHANGELOG updated. Fixed MR bug. Logger improved
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 27b8e07dc9a..2581f3be4c9 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -128,7 +128,7 @@ class MergeRequest < ActiveRecord::Base def unmerged_diffs commits = project.repo.commits_between(target_branch, source_branch).map {|c| Commit.new(c)} - diffs = project.repo.diff(commits.first.prev_commit.id, commits.last.id) + diffs = project.repo.diff(commits.first.prev_commit.id, commits.last.id) rescue [] end def last_commit |