aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorRobert2017-07-10 13:22:22 +0200
committerRobert2017-07-10 13:22:22 +0200
commit6f92dd7af5e4cd370ae4f1ba53ec5ca27c24445d (patch)
treeb78786d4c087ad2e3d175446cbd51b7c6ae675ed /config
parent0747bddf0740e512596cc2efcc1943d5195aec85 (diff)
downloadchouette-core-6f92dd7af5e4cd370ae4f1ba53ec5ca27c24445d.tar.bz2
Updated Webmock gem from 3.0.0 to 3.0.1 -- both have been released the same day, there should be something wrong with 3.0.0
Diffstat (limited to 'config')
-rw-r--r--config/environments/development.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 59cb9eefa..2ca9c828f 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -61,13 +61,13 @@ Rails.application.configure do
config.reflex_api_url = "https://pprod.reflex.stif.info/ws/reflex/V1/service=getData"
config.codifligne_api_url = "https://pprod.codifligne.stif.info/rest/v1/lc/getlist"
- # config.chouette_authentication_settings = {
- # type: "database"
- # }
config.chouette_authentication_settings = {
- type: "cas",
- cas_server: "http://stif-portail-dev.af83.priv/sessions"
+ type: "database"
}
+ # config.chouette_authentication_settings = {
+ # type: "cas",
+ # cas_server: "http://stif-portail-dev.af83.priv/sessions"
+ # }
config.stif_portail_api =
{
key: "Ohphie1Voo6the5hohpi",