From: Tom Hughes <tom@compton.nu>
Date: Thu, 13 Aug 2009 17:18:08 +0000 (+0000)
Subject: Merge 16891:17044 from trunk.
X-Git-Tag: live~6746^2~3
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/908a6ef409518d86bfd2cdf0d2a82a6c312821c8

Merge 16891:17044 from trunk.
---

908a6ef409518d86bfd2cdf0d2a82a6c312821c8
diff --cc app/controllers/trace_controller.rb
index 17b667969,b8d189316..f06a162fb
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@@ -3,14 -3,12 +3,14 @@@ class TraceController < ApplicationCont
  
    before_filter :authorize_web
    before_filter :set_locale
-   before_filter :require_user, :only => [:mine, :create, :edit, :delete, :make_public]
+   before_filter :require_user, :only => [:mine, :create, :edit, :delete]
    before_filter :authorize, :only => [:api_details, :api_data, :api_create]
    before_filter :check_database_readable, :except => [:api_details, :api_data, :api_create]
-   before_filter :check_database_writable, :only => [:create, :edit, :delete, :make_public]
+   before_filter :check_database_writable, :only => [:create, :edit, :delete]
    before_filter :check_api_readable, :only => [:api_details, :api_data]
    before_filter :check_api_writable, :only => [:api_create]
 +  before_filter :require_allow_read_gpx, :only => [:api_details, :api_data]
 +  before_filter :require_allow_write_gpx, :only => [:api_create]
   
    # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
    #  target_user - if set, specifies the user to fetch traces for.  if not set will fetch all traces
diff --cc db/migrate/040_create_oauth_tables.rb
index 95d690512,000000000..95d690512
mode 100644,000000..100644
--- a/db/migrate/040_create_oauth_tables.rb
+++ b/db/migrate/040_create_oauth_tables.rb
diff --cc db/migrate/041_add_fine_o_auth_permissions.rb
index ad4c7a8a4,000000000..ad4c7a8a4
mode 100644,000000..100644
--- a/db/migrate/041_add_fine_o_auth_permissions.rb
+++ b/db/migrate/041_add_fine_o_auth_permissions.rb
diff --cc db/migrate/042_add_foreign_keys_to_oauth_tables.rb
index 09de54349,000000000..09de54349
mode 100644,000000..100644
--- a/db/migrate/042_add_foreign_keys_to_oauth_tables.rb
+++ b/db/migrate/042_add_foreign_keys_to_oauth_tables.rb