comparison app/controllers/repositories_controller.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 bb32da3bea34 622f24f53b42
children
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.
137 @changeset = @repository.find_changeset_by_name(@rev) 137 @changeset = @repository.find_changeset_by_name(@rev)
138 end 138 end
139 139
140 def revisions 140 def revisions
141 @changeset_count = @repository.changesets.count 141 @changeset_count = @repository.changesets.count
142 @changeset_pages = Paginator.new self, @changeset_count, 142 @changeset_pages = Paginator.new @changeset_count,
143 per_page_option, 143 per_page_option,
144 params['page'] 144 params['page']
145 @changesets = @repository.changesets.find(:all, 145 @changesets = @repository.changesets.
146 :limit => @changeset_pages.items_per_page, 146 limit(@changeset_pages.per_page).
147 :offset => @changeset_pages.current.offset, 147 offset(@changeset_pages.offset).
148 :include => [:user, :repository, :parents]) 148 includes(:user, :repository, :parents).
149 all
149 150
150 respond_to do |format| 151 respond_to do |format|
151 format.html { render :layout => false if request.xhr? } 152 format.html { render :layout => false if request.xhr? }
152 format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") } 153 format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") }
153 end 154 end