diff options
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | config/environments/development.rb | 2 | ||||
| -rw-r--r-- | config/environments/production.rb | 25 | ||||
| -rw-r--r-- | config/environments/test.rb | 2 |
4 files changed, 22 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cc071921..7ccc2cbdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ -# Version 2.5.3 (en cours) +# Version 3.0.0 (en cours) +* Nouvelles fonctionnalités + * Mise à jour des briques logicielles utilisées ( Rails 4 et plugins associées ) et version du langage Ruby ( 1.9.3 -> 2.1.6 en restant compatible 1.9.3 ) + * Prise en compte d'une barre de progression lorsqu'un import, un export ou une validation est lancé + * Mise en valeur du format des données importées ou exportées + * Affichage d'une synthèse de la validation effectuée par lignes de transport + +# Version 2.5.3 * Nouvelles fonctionnalités * Contrôle de cohérence des communes des arrêts (Mantis 31896) * Ajout de champs dans les échanges Neptune en structurant le champ commentaire (Mantis 31897) diff --git a/config/environments/development.rb b/config/environments/development.rb index ffd7aa13d..d0a554e63 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,6 +1,8 @@ Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. + config.eager_load = false + # In the development environment your application's code is reloaded on # every request. This slows down response time but is perfect for development # since you don't have to restart the web server when you make code changes. diff --git a/config/environments/production.rb b/config/environments/production.rb index ec16019bf..2154e1788 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,6 +1,8 @@ Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. + config.eager_load = true + # Code is not reloaded between requests. config.cache_classes = true @@ -41,9 +43,12 @@ Rails.application.configure do # Prepend all log lines with the following tags. # config.log_tags = [ :subdomain, :uuid ] - + # Use a different logger for distributed setups. - config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new("rails/chouette2").tap do |syslog| + #if ENV['OS'] == 'Windows_NT' + # # args = log_path,number of files,file sizes + # config.logger = Logger.new("C:/chouette/logs/chouette2.log", 5, 10.megabytes) + config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new("rails/chouette2").tap do |syslog| syslog.level = Logger::INFO end) @@ -73,16 +78,6 @@ Rails.application.configure do # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false - # Use a different logger for distributed setups - #if ENV['OS'] == 'Windows_NT' - # # args = log_path,number of files,file sizes - # config.logger = Logger.new("C:/chouette/logs/chouette2.log", 5, 10.megabytes) - #else - require 'syslog_logger' - config.logger = SyslogLogger.new("rails/chouette2").tap do |logger| - logger.level = Logger::INFO - end - #end if ENV['CHOUETTE_BASE_URL'].nil? config.action_mailer.default_url_options = { :host => 'my-domain-name.com' } @@ -96,7 +91,8 @@ Rails.application.configure do else config.mailer_sender = ENV['CHOUETTE_MAIL_SENDER'] end - if mailer == "smtp" + + #if mailer == "smtp" if ENV['CHOUETTE_SMTP_USER'].nil? ActionMailer::Base.smtp_settings = { :address => ENV['CHOUETTE_SMTP_ADDRESS'].nil? ? "smtp.sample.com" : ENV['CHOUETTE_SMTP_ADDRESS'], @@ -111,8 +107,7 @@ Rails.application.configure do :password => ENV['CHOUETTE_SMTP_PASSWORD'], :authentication => ENV['CHOUETTE_SMTP_AUTH'] } end - end - #end + #end # Specific theme for each company # AFIMB diff --git a/config/environments/test.rb b/config/environments/test.rb index 17d434e88..255803abc 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,6 +1,8 @@ Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. + config.eager_load = false + # The test environment is used exclusively to run your application's # test suite. You never need to work with it otherwise. Remember that # your test database is "scratch space" for the test suite and is wiped |