diff options
| author | Robert | 2017-08-01 14:44:43 +0200 |
|---|---|---|
| committer | Robert | 2017-08-01 16:17:16 +0200 |
| commit | ee75bd1e579ab366eb6cac938f50e7786536472b (patch) | |
| tree | 6b23231644522b945f29e57fc72b743ab41c93c6 /config | |
| parent | f899be88e2b476bae67b5b5bfe2f4a1f7458b24e (diff) | |
| download | chouette-core-ee75bd1e579ab366eb6cac938f50e7786536472b.tar.bz2 | |
Refs: #3507@2h; CR Step 4
- Added tests for HTTPService (regression)
- Removed some dead code (Workbench model spec, Import factory)
- Changed front_end_host to rails_host in config
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/development.rb | 4 | ||||
| -rw-r--r-- | config/environments/test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 42523a761..ab4a29a3e 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -82,8 +82,8 @@ Rails.application.configure do config.portal_url = "http://stif-boiv-staging.af83.priv" # IEV url - config.iev_url = ENV.fetch('IEV_URL', 'http://localhost:8080') - config.front_end_host = ENV.fetch('FRONT_END_URL', 'http://localhost:3000') + config.iev_url = ENV.fetch('IEV_URL', 'http://localhost:8080') + config.rails_host = ENV.fetch('FRONT_END_URL', 'http://localhost:3000') # file to data for demo config.demo_data = "tmp/demo.zip" diff --git a/config/environments/test.rb b/config/environments/test.rb index 9b6191546..b3312be4a 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -62,7 +62,7 @@ Rails.application.configure do # Reflex api url config.reflex_api_url = "https://195.46.215.128/ws/reflex/V1/service=getData" - config.front_end_host = "http://www.example.com" + config.rails_host = "http://www.example.com" # file to data for demo config.demo_data = "tmp/demo.zip" |
