projects
/
rails.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'upstream/pull/2186'
[rails.git]
/
app
/
controllers
/
api_controller.rb
diff --git
a/app/controllers/api_controller.rb
b/app/controllers/api_controller.rb
index 511748d8d6775ab4d3b1080ae1398a7d2b7404e8..579af27cf4d8fcac9683cab09feaf640d7df5f64 100644
(file)
--- a/
app/controllers/api_controller.rb
+++ b/
app/controllers/api_controller.rb
@@
-32,7
+32,7
@@
class ApiController < ApplicationController
def gpx_status
status = database_status
- status =
:offline if status == :online
&& Settings.status == "gpx_offline"
+ status =
"offline" if status == "online"
&& Settings.status == "gpx_offline"
status
end