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

diff --cc .rubocop_todo.yml
Simple merge

diff --cc config/locales/en.yml
index 6a496be1a106fc34501037235f49f65db5c23346,d0b574a0966bb134f1ca4c5f2179a9e55a5dec0f..197c6308ccb3385c0250396a5ad791bd8c2cce00
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -242,18 -242,14 +242,18 @@@ en
        load_more: "Load more"
      timeout:
        sorry: "Sorry, the list of changesets you requested took too long to retrieve."
 -    rss:
 -      title_all: OpenStreetMap changeset discussion
 -      title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
 +  changeset_comments:
 +    comment:
        comment: "New comment on changeset #%{changeset_id} by %{author}"
 -      commented_at_html: "Updated %{when} ago"
        commented_at_by_html: "Updated %{when} ago by %{user}"
 -      full: Full discussion
 +    comments:
 +      comment: "New comment on changeset #%{changeset_id} by %{author}"
 +    index:
 +      title_all: OpenStreetMap changeset discussion
 +      title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
 +    timeout:
 +      sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
-   diary_entry:
+   diary_entries:
      new:
        title: New Diary Entry
        publish_button: "Publish"

diff --cc config/routes.rb
index 7c3bf0b94a28d1bcb22121c6d9565054e8fb743d,1f25a62c68fe6bcdd870d7c758fa9ef81d50562b..78146606429787f6ec7fd78c74a628ce7b9f0341
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -16,42 -16,42 +16,42 @@@ OpenStreetMap::Application.routes.draw 
      put "changeset/:id" => "changeset#update", :id => /\d+/
      put "changeset/:id/close" => "changeset#close", :id => /\d+/
      get "changesets" => "changeset#query"
 -    post "changeset/:id/comment" => "changeset#comment", :as => :changeset_comment, :id => /\d+/
 -    post "changeset/comment/:id/hide" => "changeset#hide_comment", :as => :changeset_comment_hide, :id => /\d+/
 -    post "changeset/comment/:id/unhide" => "changeset#unhide_comment", :as => :changeset_comment_unhide, :id => /\d+/
 +    post "changeset/:id/comment" => "changeset_comments#create", :as => :changeset_comment, :id => /\d+/
 +    post "changeset/comment/:id/hide" => "changeset_comments#destroy", :as => :changeset_comment_hide, :id => /\d+/
 +    post "changeset/comment/:id/unhide" => "changeset_comments#restore", :as => :changeset_comment_unhide, :id => /\d+/
  
-     put "node/create" => "node#create"
-     get "node/:id/ways" => "way#ways_for_node", :id => /\d+/
-     get "node/:id/relations" => "relation#relations_for_node", :id => /\d+/
-     get "node/:id/history" => "old_node#history", :id => /\d+/
-     post "node/:id/:version/redact" => "old_node#redact", :version => /\d+/, :id => /\d+/
-     get "node/:id/:version" => "old_node#version", :id => /\d+/, :version => /\d+/
-     get "node/:id" => "node#read", :id => /\d+/
-     put "node/:id" => "node#update", :id => /\d+/
-     delete "node/:id" => "node#delete", :id => /\d+/
-     get "nodes" => "node#nodes"
- 
-     put "way/create" => "way#create"
-     get "way/:id/history" => "old_way#history", :id => /\d+/
-     get "way/:id/full" => "way#full", :id => /\d+/
-     get "way/:id/relations" => "relation#relations_for_way", :id => /\d+/
-     post "way/:id/:version/redact" => "old_way#redact", :version => /\d+/, :id => /\d+/
-     get "way/:id/:version" => "old_way#version", :id => /\d+/, :version => /\d+/
-     get "way/:id" => "way#read", :id => /\d+/
-     put "way/:id" => "way#update", :id => /\d+/
-     delete "way/:id" => "way#delete", :id => /\d+/
-     get "ways" => "way#ways"
- 
-     put "relation/create" => "relation#create"
-     get "relation/:id/relations" => "relation#relations_for_relation", :id => /\d+/
-     get "relation/:id/history" => "old_relation#history", :id => /\d+/
-     get "relation/:id/full" => "relation#full", :id => /\d+/
-     post "relation/:id/:version/redact" => "old_relation#redact", :version => /\d+/, :id => /\d+/
-     get "relation/:id/:version" => "old_relation#version", :id => /\d+/, :version => /\d+/
-     get "relation/:id" => "relation#read", :id => /\d+/
-     put "relation/:id" => "relation#update", :id => /\d+/
-     delete "relation/:id" => "relation#delete", :id => /\d+/
-     get "relations" => "relation#relations"
+     put "node/create" => "nodes#create"
+     get "node/:id/ways" => "ways#ways_for_node", :id => /\d+/
+     get "node/:id/relations" => "relations#relations_for_node", :id => /\d+/
+     get "node/:id/history" => "old_nodes#history", :id => /\d+/
+     post "node/:id/:version/redact" => "old_nodes#redact", :version => /\d+/, :id => /\d+/
+     get "node/:id/:version" => "old_nodes#version", :id => /\d+/, :version => /\d+/
+     get "node/:id" => "nodes#read", :id => /\d+/
+     put "node/:id" => "nodes#update", :id => /\d+/
+     delete "node/:id" => "nodes#delete", :id => /\d+/
+     get "nodes" => "nodes#nodes"
+ 
+     put "way/create" => "ways#create"
+     get "way/:id/history" => "old_ways#history", :id => /\d+/
+     get "way/:id/full" => "ways#full", :id => /\d+/
+     get "way/:id/relations" => "relations#relations_for_way", :id => /\d+/
+     post "way/:id/:version/redact" => "old_ways#redact", :version => /\d+/, :id => /\d+/
+     get "way/:id/:version" => "old_ways#version", :id => /\d+/, :version => /\d+/
+     get "way/:id" => "ways#read", :id => /\d+/
+     put "way/:id" => "ways#update", :id => /\d+/
+     delete "way/:id" => "ways#delete", :id => /\d+/
+     get "ways" => "ways#ways"
+ 
+     put "relation/create" => "relations#create"
+     get "relation/:id/relations" => "relations#relations_for_relation", :id => /\d+/
+     get "relation/:id/history" => "old_relations#history", :id => /\d+/
+     get "relation/:id/full" => "relations#full", :id => /\d+/
+     post "relation/:id/:version/redact" => "old_relations#redact", :version => /\d+/, :id => /\d+/
+     get "relation/:id/:version" => "old_relations#version", :id => /\d+/, :version => /\d+/
+     get "relation/:id" => "relations#read", :id => /\d+/
+     put "relation/:id" => "relations#update", :id => /\d+/
+     delete "relation/:id" => "relations#delete", :id => /\d+/
+     get "relations" => "relations#relations"
  
      get "map" => "api#map"
  

diff --cc test/controllers/changeset_controller_test.rb
Simple merge