diff options
| author | Xinhui Xu | 2016-10-13 15:56:23 +0200 |
|---|---|---|
| committer | GitHub | 2016-10-13 15:56:23 +0200 |
| commit | 67bcf4788a0f89f8aef7019c205a3ecc28f1760e (patch) | |
| tree | 7c4da11ab043945b2acb4d9e22f9b957fa3e451c /config/initializers | |
| parent | c2403fa61c0639d2165af57e6db993a429ae5984 (diff) | |
| parent | e55be719d1f65f518a63ba65cf443d2d49c291bb (diff) | |
| download | chouette-core-67bcf4788a0f89f8aef7019c205a3ecc28f1760e.tar.bz2 | |
Merge pull request #4 from AF83/master
Merge master into Staging
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/apartment.rb | 4 | ||||
| -rw-r--r-- | config/initializers/codifligne.rb | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb index 93ce2d8c6..db352fa6f 100644 --- a/config/initializers/apartment.rb +++ b/config/initializers/apartment.rb @@ -25,8 +25,12 @@ Apartment.configure do |config| "Api::V1::ApiKey", "RuleParameterSet", "StopAreaReferential", + "StopAreaReferentialSync", + "StopAreaReferentialSyncMessage", "Chouette::StopArea", "LineReferential", + "LineReferentialSync", + "LineReferentialSyncMessage", "Chouette::Line", "Chouette::GroupOfLine", "Chouette::Company", diff --git a/config/initializers/codifligne.rb b/config/initializers/codifligne.rb new file mode 100644 index 000000000..321419e02 --- /dev/null +++ b/config/initializers/codifligne.rb @@ -0,0 +1,3 @@ +if Rails.application.config.try(:codifligne_api_url) + Codifligne::API.base_url = Rails.application.config.codifligne_api_url +end |