diff options
| author | Marius Mathiesen <marius.mathiesen@gmail.com> | 2009-06-23 10:29:34 +0200 |
|---|---|---|
| committer | Marius Mathiesen <marius.mathiesen@gmail.com> | 2009-06-24 12:20:36 +0200 |
| commit | 673ed110603f093e32dd0e67e3d5394a74b9e6a1 (patch) | |
| tree | 23d3ae32cf6e1f3032c06d36df0e15319e69d806 /app/models/merge_request.rb | |
| parent | 4b413e37cf8f1e8881fff7c0a9d357c2ca733db3 (diff) | |
| download | gitorious-mainline-outdated-673ed110603f093e32dd0e67e3d5394a74b9e6a1.zip gitorious-mainline-outdated-673ed110603f093e32dd0e67e3d5394a74b9e6a1.tar.gz gitorious-mainline-outdated-673ed110603f093e32dd0e67e3d5394a74b9e6a1.tar.bz2 | |
Handle legacy merge requests (=no versions) with a different template
- Use dropdown for selecting versions instead of list
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 44c3f9e..d78baf6 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -464,7 +464,7 @@ class MergeRequest < ActiveRecord::Base end def current_version_number - versions.last.version + versions.blank? ? nil : versions.last.version end # Verify that +a_commit+ exists in target branch. Git cherry would return a list of commits if this is not the case |