aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3408 from guilleiguaran/remove-turnJosé Valim2011-10-223-28/+0
|\
| * Remove Turn from default Gemfile.Guillermo Iguaran2011-10-223-28/+0
* | Revert "Merge pull request #3405 from arunagw/middleware_name"Aaron Patterson2011-10-221-1/+1
|/
* Merge pull request #3405 from arunagw/middleware_nameAaron Patterson2011-10-221-1/+1
|\
| * Using middleware name to show proper name in the infoArun Agrawal2011-10-221-1/+1
* | minor fixes in the composed_of docVijay Dev2011-10-221-3/+4
* | Merge pull request #3407 from arunagw/rake_upgradeXavier Noria2011-10-221-6/+1
|\ \ | |/ |/|
| * No need to check ruby version here Arun Agrawal2011-10-221-6/+1
|/
* Merge pull request #3404 from arunagw/warning_removed_request_idJosé Valim2011-10-221-2/+2
|\
| * Warnings removed from RequestIdTestArun Agrawal2011-10-221-2/+2
|/
* Merge pull request #3396 from bdurand/session_cache_storeJosé Valim2011-10-216-8/+243
|\
| * Add ActionDispatch::Session::CacheStore as a generic way of storing sessions ...Brian Durand2011-10-216-8/+243
* | Merge pull request #3400 from greinacker/sqlite-decimalAaron Patterson2011-10-212-0/+39
|\ \
| * | preserve decimal column attributes after migrationGreg Reinacker2011-10-212-0/+39
|/ /
* | Merge pull request #3395 from bdurand/fix_file_store_cleanupJosé Valim2011-10-213-4/+57
|\ \
| * | Fix ActiveSupport::Cache::FileStore.cleanup to actually work.Brian Durand2011-10-213-4/+57
| |/
* | Merge pull request #3394 from bdurand/buffered_logger_threadsJosé Valim2011-10-212-8/+89
|\ \ | |/ |/|
| * Fix threading issues with BufferedLogger.Brian Durand2011-10-212-8/+89
|/
* Merge pull request #3387 from arunagw/tagged_log_nilJosé Valim2011-10-212-1/+7
|\
| * Checking blank if tag might coming nil or blankArun Agrawal2011-10-212-1/+7
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-2010-60/+281
|\
| * Fixed misleading docs for String#to_formatted_s(:db)Martin Svalin2011-10-201-3/+3
| * Correct ActionMailer subject i18n lookup scope. Andrew France2011-10-201-1/+1
| * [engines guide] explanation of overriding views + referencing routes from an ...Ryan Bigg2011-10-201-2/+57
| * [engines guide] some fixes for the author id migration including proof of not...Ryan Bigg2011-10-201-4/+10
| * [engines guide] add missing end for to_s methodRyan Bigg2011-10-201-0/+1
| * [engines guide] wrap up 'Configuring an Engine' sectionRyan Bigg2011-10-201-0/+2
| * [engines guide] Rather than calling name, require a to_s method to be defined...Ryan Bigg2011-10-201-2/+17
| * [engines guide] mention that we cover similar ground to the Getting Started G...Ryan Bigg2011-10-201-1/+1
| * Removed mention of deprecated ActiveModel::Errors#onMartin Svalin2011-10-191-3/+2
| * Fixes the defaults for config.cache_classesAndy Lindeman2011-10-181-1/+1
| * Clarified that the config.assets.initialize_on_precompile directive needs to ...Pascal Lindelauf2011-10-171-1/+1
| * [engines guide] missed a spot in the 'Using a class section' + further text f...Ryan Bigg2011-10-171-2/+69
| * [engines guide] Point out that we need to run rake db:migrate after creating ...Ryan Bigg2011-10-171-0/+2
| * [engines guide] [reviewing] remove excessive 'Now'Ryan Bigg2011-10-171-1/+1
| * [engines guide] Complete section about using an application's classRyan Bigg2011-10-171-5/+26
| * [engines guide] beginning to cover using application's classesRyan Bigg2011-10-161-1/+23
| * [engines guide] Add 'Engine setup' section in 'Hooking into an application' s...Ryan Bigg2011-10-161-2/+20
| * [engines guide] improve intro to 'Hooking into an application' sectionRyan Bigg2011-10-161-2/+6
| * [layouts and rendering] Copy editingmhutchin2011-10-151-26/+26
| * HTMl -> HTML: html scanner comment fixAlexey Vakhov2011-10-151-1/+1
| * more doc changes on railties READMEKarunakar (Ruby)2011-10-161-1/+4
| * railties README change to make consistent like others eg:activerecordKarunakar (Ruby)2011-10-161-4/+10
| * [layouts and rendering] Copy editing to improve readabilitymhutchin2011-10-151-11/+11
| * Update AC::RecordIdentifier exampleAlexey Vakhov2011-10-151-2/+2
* | Merge pull request #3258 from ileitch/3-1-stableAaron Patterson2011-10-202-1/+23
* | Merge pull request #3375 from arunagw/middleware_test_fixJosé Valim2011-10-201-0/+1
|\ \
| * | Adding ActionDispatch::RequestId in middleware testArun Agrawal2011-10-201-0/+1
* | | Merge pull request #3374 from marcbowes/masterJosé Valim2011-10-201-1/+1
|\ \ \ | |/ / |/| |
| * | Remove the unneeded `\d` when sanitizing `X-Request-Id`.Marc Bowes2011-10-201-1/+1
|/ /