From: Mayank Tankhiwale <mayank.tankhiwale@gmail.com>
Date: Sat, 23 Nov 2019 15:02:47 +0000 (+0530)
Subject: Merge branch 'master' of https://github.com/tankhiwale/openstreetmap-website
X-Git-Tag: live~3345^2~1
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/11cd1c9fc1417f5e6b52991897b29bb94a4288a4?ds=inline;hp=-c

Merge branch 'master' of https://github.com/tankhiwale/openstreetmap-website
---

11cd1c9fc1417f5e6b52991897b29bb94a4288a4
diff --combined config/routes.rb
index 2c904fc48,d936072d7..6764335d6
--- a/config/routes.rb
+++ b/config/routes.rb
@@@ -67,11 -67,11 +67,11 @@@ OpenStreetMap::Application.routes.draw 
      get "user/gpx_files" => "api/users#gpx_files"
      get "users" => "api/users#index", :as => :api_users
  
-     get "user/preferences" => "api/user_preferences#read"
-     get "user/preferences/:preference_key" => "api/user_preferences#read_one"
-     put "user/preferences" => "api/user_preferences#update"
-     put "user/preferences/:preference_key" => "api/user_preferences#update_one"
-     delete "user/preferences/:preference_key" => "api/user_preferences#delete_one"
+     get "user/preferences" => "api/user_preferences#index"
+     get "user/preferences/:preference_key" => "api/user_preferences#show"
+     put "user/preferences" => "api/user_preferences#update_all"
+     put "user/preferences/:preference_key" => "api/user_preferences#update"
+     delete "user/preferences/:preference_key" => "api/user_preferences#destroy"
  
      post "gpx/create" => "api/traces#create"
      get "gpx/:id" => "api/traces#show", :id => /\d+/
@@@ -146,7 -146,6 +146,7 @@@
    get "/welcome" => "site#welcome"
    get "/fixthemap" => "site#fixthemap"
    get "/help" => "site#help"
 +  get "/about/:about_locale" => "site#about"
    get "/about" => "site#about"
    get "/history" => "changesets#index"
    get "/history/feed" => "changesets#feed", :defaults => { :format => :atom }