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

diff --git a/app/controllers/api/traces_controller.rb b/app/controllers/api/traces_controller.rb
index 000bb7f9036ec095bdf1df3d6c7db6954a1c1240..0b441bef986d9aa5ba4bfd1625001a6144b7115f 100644 (file)
--- a/app/controllers/api/traces_controller.rb
+++ b/app/controllers/api/traces_controller.rb
@@ -159,7 +159,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

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index 03487e7ab810cc175e3878197da8cdcbb17fa699..0d3a1aa33c652a4c320e14ee0ebc48568d1ce0fb 100644 (file)
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -90,7 +90,6 @@ class TracesController < ApplicationController
   end
 
   def new
-    logger.info "new"
     @title = t ".upload_trace"
     @trace = Trace.new(:visibility => default_visibility)
   end
@@ -318,7 +317,6 @@ class TracesController < ApplicationController
   end
 
   def offline_redirect
-    logger.info "offline_redirect status is #{Settings.status}"
     render :action => :offline if Settings.status == "gpx_offline"
   end