From 72795d7257f3fbaaf235c6dad9a398bb1430de8d Mon Sep 17 00:00:00 2001 From: Mark Rushakoff Date: Fri, 27 Apr 2012 22:46:45 -0700 Subject: Code-format references to config settings --- railties/lib/rails/engine.rb | 2 +- railties/lib/rails/railtie.rb | 2 +- railties/lib/rails/railtie/configuration.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 5d99b820c9..fa582f963c 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -332,7 +332,7 @@ module Rails # # == Loading priority # - # In order to change engine's priority you can use config.railties_order in main application. + # In order to change engine's priority you can use +config.railties_order+ in main application. # It will affect the priority of loading views, helpers, assets and all the other files # related to engine or application. # diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb index dc5de4084e..2102f8a03c 100644 --- a/railties/lib/rails/railtie.rb +++ b/railties/lib/rails/railtie.rb @@ -22,7 +22,7 @@ module Rails # # * creating initializers # * configuring a Rails framework for the application, like setting a generator - # * adding config.* keys to the environment + # * +adding config.*+ keys to the environment # * setting up a subscriber with ActiveSupport::Notifications # * adding rake tasks # diff --git a/railties/lib/rails/railtie/configuration.rb b/railties/lib/rails/railtie/configuration.rb index cf9e4ad500..1c6b3769a5 100644 --- a/railties/lib/rails/railtie/configuration.rb +++ b/railties/lib/rails/railtie/configuration.rb @@ -43,7 +43,7 @@ module Rails ActiveSupport.on_load(:before_configuration, :yield => true, &block) end - # Third configurable block to run. Does not run if config.cache_classes + # Third configurable block to run. Does not run if +config.cache_classes+ # set to false. def before_eager_load(&block) ActiveSupport.on_load(:before_eager_load, :yield => true, &block) -- cgit v1.2.3 From c3954baee92446219606621c1b185360553a6d5d Mon Sep 17 00:00:00 2001 From: Gaurish Sharma Date: Mon, 30 Apr 2012 19:29:40 +0530 Subject: Added Short 1 line note about connection pools. I hope its okay to add this here. if not, then please revert back. --- .../generators/rails/app/templates/config/databases/postgresql.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml index 467a4e725f..d67cd5be53 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml @@ -16,6 +16,8 @@ development: adapter: postgresql encoding: unicode database: <%= app_name %>_development + + # Reduce overhead by distributing requests across a pool of connections. pool: 5 username: <%= app_name %> password: -- cgit v1.2.3 From 339602b219e1fd842599f6750eb965f327a995c4 Mon Sep 17 00:00:00 2001 From: Vijay Dev Date: Tue, 1 May 2012 18:54:24 +0530 Subject: Revert "Added Short 1 line note about connection pools. " This reverts commit c3954baee92446219606621c1b185360553a6d5d. --- .../generators/rails/app/templates/config/databases/postgresql.yml | 2 -- 1 file changed, 2 deletions(-) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml index d67cd5be53..467a4e725f 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml @@ -16,8 +16,6 @@ development: adapter: postgresql encoding: unicode database: <%= app_name %>_development - - # Reduce overhead by distributing requests across a pool of connections. pool: 5 username: <%= app_name %> password: -- cgit v1.2.3