diff options
| author | Marius Mathiesen <marius.mathiesen@gmail.com> | 2009-06-24 13:18:58 +0200 |
|---|---|---|
| committer | Marius Mathiesen <marius.mathiesen@gmail.com> | 2009-06-24 13:18:58 +0200 |
| commit | d02cdc4020ee8a2354cc2633352de7a6b76f6562 (patch) | |
| tree | 1ad9f838b589bac3caf0ae3b8a442c982fc8d05e /app/models/merge_request.rb | |
| parent | 30582e61e2c44a787422f2863bb753f302c1b377 (diff) | |
| download | gitorious-mainline-outdated-d02cdc4020ee8a2354cc2633352de7a6b76f6562.zip gitorious-mainline-outdated-d02cdc4020ee8a2354cc2633352de7a6b76f6562.tar.gz gitorious-mainline-outdated-d02cdc4020ee8a2354cc2633352de7a6b76f6562.tar.bz2 | |
For legacy merge requests (that is, no versions yet) we need to use the ending_commit as limit
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 8f93e4f..608a431 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -256,9 +256,14 @@ class MergeRequest < ActiveRecord::Base if ready? commit_diff_from_tracking_repo else - commits_for_selection + commits_to_be_merged_when_no_version end end + + def commits_to_be_merged_when_no_version + idx = commits_for_selection.index(commits_for_selection.find{|c| c.id == ending_commit}) + return idx ? commits_for_selection[idx..-1] : [] + end def ready? !versions.blank? |