Merge remote-tracking branch 'upstream/pull/5410'
This commit is contained in:
commit
7d4cc85a31
2 changed files with 21 additions and 18 deletions
|
@ -77,18 +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, :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"
|
||||
|
||||
post "/user/messages/:id" => "messages#update", :as => :api_message_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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue