diff options
| author | Alban Peignier | 2016-05-26 09:38:52 +0200 |
|---|---|---|
| committer | Alban Peignier | 2016-05-26 09:38:52 +0200 |
| commit | a1f01c4eb5b3f8cc587775fedc825bbfb2f100d9 (patch) | |
| tree | 5f0468992484aba0aa01abe27eeff024618f81b4 /config | |
| parent | 11b611acc80cc6bb80b369e33c090d3f6975d694 (diff) | |
| parent | 1c5c343cb27225e970bca65f1b1269054a8386d8 (diff) | |
| download | chouette-core-a1f01c4eb5b3f8cc587775fedc825bbfb2f100d9.tar.bz2 | |
Merge branch 'master' into staging
Diffstat (limited to 'config')
| -rw-r--r-- | config/environment.rb | 2 | ||||
| -rw-r--r-- | config/environments/development.rb | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/config/environment.rb b/config/environment.rb index dbb8bc8b6..3bc3051d1 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -5,4 +5,4 @@ require File.expand_path('../application', __FILE__) Rails.application.initialize! # Fix version -APP_VERSION = '3.2.0' +APP_VERSION = 'Iteration 4' diff --git a/config/environments/development.rb b/config/environments/development.rb index 336b3b700..a197dd366 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -51,11 +51,10 @@ Rails.application.configure do end # Specific theme for each company - # AFIMB - config.company_name = "afimb" - config.company_theme = "#61970b" # AFIMB color + config.company_name = "STIF" + config.company_theme = "#66b4e0" config.company_contact = "http://www.chouette.mobi/club-utilisateurs/contact-support/" - config.accept_user_creation = true + config.accept_user_creation = false config.chouette_authentication_settings = { type: "database" |