Mercurial > hg > soundsoftware-site
comparison app/models/repository/mercurial.rb @ 1298:4f746d8966dd redmine_2.3_integration
Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author | Chris Cannam |
---|---|
date | Fri, 14 Jun 2013 09:28:30 +0100 |
parents | 51d7f3e06556 622f24f53b42 |
children | c86dacc2ef0a |
comparison
equal
deleted
inserted
replaced
1297:0a574315af3e | 1298:4f746d8966dd |
---|---|
1 # Redmine - project management software | 1 # Redmine - project management software |
2 # Copyright (C) 2006-2012 Jean-Philippe Lang | 2 # Copyright (C) 2006-2013 Jean-Philippe Lang |
3 # | 3 # |
4 # This program is free software; you can redistribute it and/or | 4 # This program is free software; you can redistribute it and/or |
5 # modify it under the terms of the GNU General Public License | 5 # modify it under the terms of the GNU General Public License |
6 # as published by the Free Software Foundation; either version 2 | 6 # as published by the Free Software Foundation; either version 2 |
7 # of the License, or (at your option) any later version. | 7 # of the License, or (at your option) any later version. |
90 # there is no need to set 'order'. | 90 # there is no need to set 'order'. |
91 # But, MySQL test fails. | 91 # But, MySQL test fails. |
92 # Sqlite3 and PostgreSQL pass. | 92 # Sqlite3 and PostgreSQL pass. |
93 # Is this MySQL bug? | 93 # Is this MySQL bug? |
94 def latest_changesets(path, rev, limit=10) | 94 def latest_changesets(path, rev, limit=10) |
95 changesets.find(:all, | 95 changesets. |
96 :include => :user, | 96 includes(:user). |
97 :conditions => latest_changesets_cond(path, rev, limit), | 97 where(latest_changesets_cond(path, rev, limit)). |
98 :limit => limit, | 98 limit(limit). |
99 :order => "#{Changeset.table_name}.id DESC") | 99 order("#{Changeset.table_name}.id DESC"). |
100 all | |
100 end | 101 end |
101 | 102 |
102 def latest_changesets_cond(path, rev, limit) | 103 def latest_changesets_cond(path, rev, limit) |
103 cond, args = [], [] | 104 cond, args = [], [] |
104 if scm.branchmap.member? rev | 105 if scm.branchmap.member? rev |