aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Add HTML generation task for the routing guide.Hongli Lai (Phusion)2008-09-051-5/+17
|
* Merge branch 'master' of git@github.com:lifo/docrailsHongli Lai (Phusion)2008-09-052-15/+291
|\
| * Edits to the "Routing from the Outside In" guide.Mike Gunderloy2008-09-051-15/+71
| | | | | | | | Cleaned up a few parts, reworded coverage of classic vs. RESTful routing, added coverage of routing assertions.
| * More work on Rails debugging guide.miloops2008-09-041-14/+50
| |
| * Added prompt, context and references to debugging Rails guide.miloops2008-09-041-0/+131
| |
| * Initial commit of the Rails debugging guide.miloops2008-09-041-0/+53
| |
* | Merge branch 'master' of git@github.com:lifo/docrailsHongli Lai (Phusion)2008-09-0421-178/+920
|\|
| * Merge commit 'mainstream/master'Pratik Naik2008-09-034-6/+7
| |\ | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/resources.rb
| | * Inline help text was incorrectly telling user to uncomment line to use ↵Nigel Ramsay2008-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | default local time. User should comment the line to use default local time. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#960 state:committed]
| | * Database connections are now pooled, one pool per #establish_connection call.Jeremy Kemper2008-09-022-3/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pools start out empty and grow as necessary to a maximum size (default is 5, configure size with key 'pool' in your database configuration). If no connections are available, a thread will wait up to a 'wait_timeout' time (default is 5 seconds). Connections are verified and reset when checked out from the pool (usually upon first access to ActiveRecord::Base.connection), and returned back to the pool after each request. If you would like to use connection pools outside of ActionPack, there is an ActiveRecord::Base.connection_pool method that gives you access to the pool, and you can manually checkout/checkin connections, or supply a block to ActiveRecord::Base.connection_pool.with_connection which takes care of the checkout/checkin for you. [#936 state:resolved]
| | | * Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, ↵Jeremy Kemper2008-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but it has since been removed from 1.9. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> Conflicts: actionpack/test/controller/layout_test.rb
| | | * Added optional rake doc:app TITLE environment parameterNathaniel Bibler2008-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | [#939 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| | * | Remove call to active_record.allow_concurrency since it's deprecatedNick Sieger2008-08-291-1/+0
| | | |
| | * | Revert "Change all databases.rake adapter 'when' statements to use regexes."Nick Sieger2008-08-291-18/+18
| | | | | | | | | | | | | | | | This reverts commit 3d2512d38d2e28b3ea669139f7c7b0307522aa72.
| | * | Change all databases.rake adapter 'when' statements to use regexes.Nick2008-08-291-18/+18
| | |/ | | | | | | | | | | | | | | | This is more friendly to JRuby/JDBC adapters (with names like 'jdbcmysql') and leaves the door open to alternate implementations of adapters in the future.
| | * Prevent deprecation warning in the testsMichael Koziarski2008-08-281-1/+3
| | |
| * | Added "Routing from the Outside In" guide.Mike Gunderloy2008-08-311-0/+763
| | |
| * | Merge commit 'mainstream/master'Pratik Naik2008-08-2819-173/+151
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/callbacks.rb activeresource/lib/active_resource/base.rb
| | * Formally deprecate the old secret key generatorMichael Koziarski2008-08-271-0/+1
| | |
| | * Deprecate Rails::SecretKeyGenerator in favor of ActiveSupport::SecureRandom.Hongli Lai (Phusion2008-08-274-161/+8
| | | | | | | | | | | | | | | | | | | | | SecureRandom has a few minor security enhancements and can be used as a drop-in replacement Signed-off-by: Michael Koziarski <michael@koziarski.com> [#913 state:committed]
| | * The 'rails' command was broken by the last commit. Fix that.Hongli Lai (Phusion2008-08-262-3/+10
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * When an unexpected exception is caught, tell the administrator to read the ↵Hongli Lai (Phusion2008-08-262-0/+39
| | | | | | | | | | | | | | | | | | log file for more information about the error. This should make things less confusing for developers who are new to Rails. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * Reverse the priority of the mysql commands in dbconsoleMichael Koziarski2008-08-241-1/+1
| | |
| | * Generate belongs_to association when generating a modelTarmo Tänav2008-08-233-1/+13
| | |
| | * Generate belongs_to associations automatically for 'references' types [#640 ↵Tarmo Tänav2008-08-232-0/+11
| | | | | | | | | | | | state:resolved]
| | * Always require activesupport, even if its constant already existsTarmo Tänav2008-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed because the existance of the ActiveSupport constant by itself does not guarantee that the whole library has been loaded. Also load the StringInquirer in the Rails#env method as the it might be called inside the initializer block before activesupport itself has been loaded.
| | * Fixed that rake doc:plugins to uses UTF-8. [#573 state:resolved]Chris Lloyd2008-08-221-0/+1
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Initializer to sort files before eager loading. [#859 state:resolved]Tom Ward2008-08-224-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | Changed Rails::Initializer to sort files before eager loading them. This ensures that any files in a parent directory will be loaded before files in a subdirectory of the 'same' name. i.e. zoo.rb will be loaded before zoo/reptile_house.rb Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Touch file with git revision when freezing edgeJoshua Peek2008-08-191-0/+5
| | |
| | * Removed config.ru template from app generatorJoshua Peek2008-08-191-1/+0
| | |
| | * Added rack logger middleware that tails the environment logJoshua Peek2008-08-192-0/+29
| | |
| | * Consistently use the framework's configured logger and avoid reverting to ↵Joshua Peek2008-08-182-8/+11
| | | | | | | | | | | | RAILS_DEFAULT_LOGGER unless necessary.
* | | Merge branch 'master' of git@github.com:lifo/docrailsHongli Lai (Phusion)2008-08-277-13/+47
|\| |
| * | Merge commit 'mainstream/master'Pratik Naik2008-08-147-13/+47
| |\| | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/request.rb actionpack/lib/action_controller/resources.rb
| | * rake db:fixtures:load and db:fixtures:identify now accept a FIXTURES_PATH ↵Matthew Rudy Jacobs2008-08-091-4/+5
| | | | | | | | | | | | | | | | | | | | | option eg. "rake db:fixtures:load FIXTURES_PATH=spec/fixtures" Signed-off-by: Michael Koziarski <michael@koziarski.com> [#792 state:committed]
| | * Added file name information for errors and exceptions in script/runnnerDaniel Rodríguez Troitiño2008-08-081-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * Make sure ActionView is loaded inorder to build view pathsJoshua Peek2008-08-061-6/+10
| | |
| | * MemoryStore is the only "unsafe" store. Make it threadsafe by default.Joshua Peek2008-08-061-1/+0
| | |
| | * Added config.threadsafe! to toggle allow concurrency settings and disable ↵Joshua Peek2008-08-043-0/+17
| | | | | | | | | | | | the dependency loader
| | * Make requiring gems optional.Ben Sandofsky2008-08-043-2/+15
| | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#743 state:resolved]
* | | Merge branch 'master' of git@github.com:lifo/docrailsHongli Lai (Phusion)2008-08-0850-275/+1287
|\| |
| * | Corrected the command-line help text for script/dbconsole.Dave Rothlisberger2008-08-041-1/+1
| | |
| * | Added a better explanation for config.active_record.observers when using it ↵Ryan Bigg2008-08-041-1/+2
| |/ | | | | | | | | | | in tandem with script/generate observer. Thanks to halogenandtoast from #rubyonrails for pointing this out.
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-07-3123-10/+14
| |\
| | * Use "/usr/bin/env ruby" instead of "/usr/local/bin/ruby"Tarmo Tänav2008-07-315-9/+9
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| | * Fix file permissionsTarmo Tänav2008-07-3118-0/+0
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| | * Turn cache_classes on by default [#645 state:resolved]Joshua Peek2008-07-312-1/+3
| | |
| | * Ensure dbconsole includes the -p parameter to mysql as intendedMichael Koziarski2008-07-311-0/+2
| | |
| * | load_application_classes requires files relative to the load path and ↵Jeremy Kemper2008-07-311-2/+3
| |/ | | | | | | without .rb extension, including .rb files in subdirectories
| * Initializer requires ERB explicitly instead of assuming Action Pack loaded ↵José Valim2008-07-301-0/+1
| | | | | | | | it. [#722 state:resolved]