aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3416 from arunagw/rbx_test_fixesJosé Valim2011-10-242-2/+9
|\
| * ActionPack test fix for RBXArun Agrawal2011-10-242-2/+9
|/
* Ignore .rbx directories (rbx compiled bytecode files)Jon Leighton2011-10-231-0/+1
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-234-20/+15
|\
| * edge doesnt provide turn gem in the gemfile anymoreVijay Dev2011-10-231-5/+0
| * Updated rack version in docs for 3.2Arun Agrawal2011-10-221-1/+1
| * Rails version to 3.2.0.beta in docsArun Agrawal2011-10-221-6/+6
| * Middleware details updated for 3.2Arun Agrawal2011-10-221-1/+1
| * Add some note on adding index to HABTM tablePrem Sichanugrist2011-10-201-0/+4
| * Use new migration style in HABTM join tablePrem Sichanugrist2011-10-201-5/+1
| * Fixed typo.Pepe Hipolito2011-10-201-1/+1
| * Fixed typo.Pepe Hipolito2011-10-201-1/+1
* | Merge pull request #3352 from arunagw/bump_sprocketsVijay Dev2011-10-221-1/+1
|\ \
| * | Bump sprocketsArun Agrawal2011-10-171-1/+1
* | | 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