aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Etienne2013-05-28 16:18:23 +0200
committerMichel Etienne2013-05-28 16:18:23 +0200
commit918b7eee9e5683697332ee62f3c82a37658eb32a (patch)
tree92a1536a2218277315afa16e718f38982aead0a0
parent1cb6ed36c3032817ced7345f2f6a3fe2369c4414 (diff)
parenta2cee7eb2b5413454077f8a55efc453894197d6d (diff)
downloadchouette-core-918b7eee9e5683697332ee62f3c82a37658eb32a.tar.bz2
Merge branch 'master' of github.com:dryade/chouette2
-rw-r--r--config/environments/development.rb2
-rw-r--r--config/environments/production.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 519ff1d24..84a5f61e9 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -44,7 +44,7 @@ ChouetteIhm::Application.configure do
}
# api key to geoportail IGN (development key 3 month validity)
- config.geoportail_api_key = "i2aqyge3x3iovnuhz7z06flp"
+ # config.geoportail_api_key = "i2aqyge3x3iovnuhz7z06flp"
config.to_prepare do
Devise::Mailer.layout "mailer"
diff --git a/config/environments/production.rb b/config/environments/production.rb
index bd85c9741..232502575 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -59,7 +59,7 @@ ChouetteIhm::Application.configure do
# config.action_mailer.raise_delivery_errors = false
#
# api key to geoportail IGN (production key link to "chouette.dryade.net" referer)
- config.geoportail_api_key = "bt4z711qv8uw4zmk2bxl4d5l"
+ #config.geoportail_api_key = "bt4z711qv8uw4zmk2bxl4d5l"
# Enable threaded mode
# NOTICE : With Rails 3.2, Delayed::JRubyWorker blocks the application without threaded mode