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

diff --combined .rubocop_todo.yml
index 83f60d4f8162bc95ce0eebd9a05578ddfbdef21a,2f6ea0087252f4da718d6035100c28cc8d7c0ed9..362cfcb3235123751c8018c9fb69250bff842c42
--- 1/.rubocop_todo.yml
--- 2/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@@ -67,7 -67,7 +67,7 @@@ Metrics/AbcSize
  # Offense count: 41
  # Configuration parameters: CountComments, ExcludedMethods.
  Metrics/BlockLength:
-   Max: 245
 -  Max: 241
++  Max: 247
  
  # Offense count: 12
  # Configuration parameters: CountBlocks.

diff --combined config/routes.rb
index c576689201b5641bdf29836d7a718b7229f32790,9ab3f57da5d4cf2abb0628745e66fb93dc8f8864..741268e4623ee6202d6791d58e682ef729f72fa7
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -207,7 -207,9 +207,9 @@@ OpenStreetMap::Application.routes.draw 
    get "/traces/mine/tag/:tag" => "traces#mine"
    get "/traces/mine/page/:page" => "traces#mine"
    get "/traces/mine" => "traces#mine"
-   match "/trace/create" => "traces#create", :via => [:get, :post]
+   resources :traces, :only => [:new, :create]
+   post "/trace/create" => "traces#create" # remove after deployment
+   get "/trace/create", :to => redirect(:path => "/traces/new")
    get "/trace/:id/data" => "traces#data", :id => /\d+/, :as => "trace_data"
    match "/trace/:id/edit" => "traces#edit", :via => [:get, :post], :id => /\d+/, :as => "trace_edit"
    post "/trace/:id/delete" => "traces#delete", :id => /\d+/
@@@ -261,16 -263,10 +263,16 @@@
    get "/export/embed" => "export#embed"
  
    # messages
 -  get "/user/:display_name/inbox" => "messages#inbox", :as => "inbox"
 -  get "/user/:display_name/outbox" => "messages#outbox", :as => "outbox"
 +  resources :messages, :only => [:show] do
 +    collection do
 +      get :inbox
 +      get :outbox
 +    end
 +  end
 +  get "/user/:display_name/inbox", :to => redirect(:path => "/messages/inbox")
 +  get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")
    match "/message/new/:display_name" => "messages#new", :via => [:get, :post], :as => "new_message"
 -  get "/message/read/:message_id" => "messages#show", :as => "message"
 +  get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")
    post "/message/mark/:message_id" => "messages#mark", :as => "mark_message"
    match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post], :as => "reply_message"
    post "/message/delete/:message_id" => "messages#destroy", :as => "destroy_message"