diff options
| author | Robert | 2017-07-10 13:22:22 +0200 |
|---|---|---|
| committer | Robert | 2017-07-10 13:22:22 +0200 |
| commit | 6f92dd7af5e4cd370ae4f1ba53ec5ca27c24445d (patch) | |
| tree | b78786d4c087ad2e3d175446cbd51b7c6ae675ed | |
| parent | 0747bddf0740e512596cc2efcc1943d5195aec85 (diff) | |
| download | chouette-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
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | config/environments/development.rb | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 256967c04..41ae70f56 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -261,7 +261,7 @@ GEM has_scope (0.7.0) actionpack (>= 4.1, < 5.1) activesupport (>= 4.1, < 5.1) - hashdiff (0.3.2) + hashdiff (0.3.4) highline (1.7.8) hike (1.2.3) htmlbeautifier (1.3.1) @@ -539,7 +539,7 @@ GEM unicode-display_width (1.1.3) warden (1.2.7) rack (>= 1.0) - webmock (3.0.0) + webmock (3.0.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff 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", |