diff options
| author | Marius Mathiesen <marius@shortcut.no> | 2009-06-30 11:24:16 +0200 |
|---|---|---|
| committer | Marius Mathiesen <marius@shortcut.no> | 2009-06-30 11:24:16 +0200 |
| commit | ef59f861e7ff3436df995b243957882be347402a (patch) | |
| tree | 5fdc329b1f087b667e86a0c7d6429c1a84b26b92 /app/models/merge_request.rb | |
| parent | 65952eb241082dead02635385b433b4437ad697d (diff) | |
| download | gitorious-mainline-outdated-ef59f861e7ff3436df995b243957882be347402a.zip gitorious-mainline-outdated-ef59f861e7ff3436df995b243957882be347402a.tar.gz gitorious-mainline-outdated-ef59f861e7ff3436df995b243957882be347402a.tar.bz2 | |
Moving the calculation of commits in a merge request version where it belongs
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 3c79fab..f162431 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -291,11 +291,7 @@ class MergeRequest < ActiveRecord::Base else versions.last end - - merge_base_sha = version.merge_base_sha - - RAILS_DEFAULT_LOGGER.debug "Merge request history command: git log #{merge_base_sha}..#{merge_branch_name(version.version)}" - @commits_to_be_merged ||= tracking_repository.git.commits_between(merge_base_sha,merge_branch_name(version.version)).reverse + version.affected_commits end def potential_commits |