Merge remote-tracking branch 'upstream/pull/2281'

diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb
index 82966a353437d1d0a0837b527d1583c9798f11ca..5b6d3e010db0e5ea89d290eb71e28856a70af3bb 100644 (file)
--- a/app/controllers/changesets_controller.rb
+++ b/app/controllers/changesets_controller.rb
@@ -60,7 +60,7 @@ class ChangesetsController < ApplicationController
 
       changesets = changesets.where("changesets.id <= ?", @params[:max_id]) if @params[:max_id]
 
-      @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments)
+      @changesets = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments)
 
       render :action => :index, :layout => false
     end

diff --git a/app/views/changesets/index.atom.builder b/app/views/changesets/index.atom.builder
index 05d9ab68ac306cf28830b714a70488ab97a8582c..b1fbd6992aa14c3ddd4d2e9c65a7c9bc9621093f 100644 (file)
--- a/app/views/changesets/index.atom.builder
+++ b/app/views/changesets/index.atom.builder
@@ -4,7 +4,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
           "xmlns:georss" => "http://www.georss.org/georss") do |feed|
   feed.title changeset_index_title(params, current_user)
 
-  feed.updated @edits.map { |e| [e.created_at, e.closed_at].max }.max
+  feed.updated @changesets.map { |e| [e.created_at, e.closed_at].max }.max
   feed.icon image_url("favicon.ico")
   feed.logo image_url("mag_map-rss2.0.png")
 
@@ -14,7 +14,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
     end
   end
 
-  @edits.each do |changeset|
+  @changesets.each do |changeset|
     feed.entry(changeset, :updated => changeset.closed_at, :id => changeset_url(changeset.id, :only_path => false)) do |entry|
       entry.link :rel => "alternate",
                  :href => changeset_show_url(changeset, :only_path => false),

diff --git a/app/views/changesets/index.html.erb b/app/views/changesets/index.html.erb
index 1ce98301a3145bedd94c3b5ed0f1efaa1567d2f6..1e3daa081e4cf3acc8dffced758d8f970d3fe338 100644 (file)
--- a/app/views/changesets/index.html.erb
+++ b/app/views/changesets/index.html.erb
@@ -1,10 +1,10 @@
-<% if @edits.present? %>
+<% if @changesets.present? %>
   <ol class="changesets">
-    <%= render :partial => "changeset", :collection => @edits %>
+    <%= render @changesets %>
   </ol>
-<% if @edits.size == 20 -%>
+<% if @changesets.size == 20 -%>
   <div class="changeset_more">
-    <%= link_to t(".load_more"), url_for(@params.merge(:max_id => @edits.last.id - 1)), :class => "button load_more" %>
+    <%= link_to t(".load_more"), url_for(@params.merge(:max_id => @changesets.last.id - 1)), :class => "button load_more" %>
     <div class="loader"><%= image_tag "searching.gif" %></div>
   </div>
 <% end -%>