Merge remote-tracking branch 'upstream/pull/2921' into master

[rails.git] / app / controllers / api / traces_controller.rb

diff --git a/app/controllers/api/traces_controller.rb b/app/controllers/api/traces_controller.rb
index 000bb7f9036ec095bdf1df3d6c7db6954a1c1240..6c77f9dc4bae539cb581a60402e372f49dc80d7d 100644 (file)
--- a/app/controllers/api/traces_controller.rb
+++ b/app/controllers/api/traces_controller.rb
@@ -1,7 +1,5 @@
 module Api
   class TracesController < ApiController
-    layout "site", :except => :georss
-
     before_action :authorize_web
     before_action :set_locale
     before_action :authorize
@@ -159,7 +157,7 @@ module Api
     end
 
     def offline_error
-      report_error "GPX files offline for maintenance", :service_unavailable
+      report_error "GPX files offline for maintenance", :service_unavailable if Settings.status == "gpx_offline"
     end
   end
 end