From: Tom Hughes Date: Tue, 7 Jul 2020 09:41:34 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/2693' X-Git-Tag: live~3128 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1ea946636b7828ffa079b2461d87728f8dba863b?hp=0dd61cbf6c8804184bd2b3104f625e2c4f50accc Merge remote-tracking branch 'upstream/pull/2693' --- diff --git a/app/controllers/api/traces_controller.rb b/app/controllers/api/traces_controller.rb index 000bb7f90..0b441bef9 100644 --- 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 03487e7ab..0d3a1aa33 100644 --- 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