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

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 77b439865450ba25e04f72b98888a22cfd90462a..4d3c1bf5575db08bf866ae8372aa3f6155dc5b18 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -77,17 +77,17 @@ OpenStreetMap::Application.routes.draw do
         put "" => "user_preferences#update_all", :as => ""
       end
     end
+  end
 
-    resources :messages, :path => "user/messages", :constraints => { :id => /\d+/ }, :only => [:create, :show, :update, :destroy], :controller => "messages", :as => :api_messages do
+  namespace :api, :path => "api/0.6" do
+    resources :messages, :path => "user/messages", :constraints => { :id => /\d+/ }, :only => [:create, :show, :update, :destroy] do
       collection do
         get "inbox"
         get "outbox"
       end
     end
     post "/user/messages/:id" => "messages#update"
-  end
 
-  namespace :api, :path => "api/0.6" do
     resources :traces, :path => "gpx", :only => [:create, :show, :update, :destroy], :id => /\d+/ do
       scope :module => :traces do
         resource :data, :only => :show