aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Let ActiveModel instances define partial paths.Grant Hutchins & Peter Jaros2011-07-2510-33/+131
* Merge pull request #2245 from davidtrogers/constraints_block_passed_to_follow...Santiago Pastorino2011-07-252-6/+25
|\
| * Ensure the constraints block is only applied to the correct routeDave Rogers2011-07-252-6/+25
* | Simplify the way default DATABASE_URL works.Glenn Gillen2011-07-251-1/+1
* | no need for an anonymous class on every setup callAaron Patterson2011-07-251-10/+9
* | Merge pull request #2258 from thedarkone/no-file-statJosé Valim2011-07-254-5/+5
|\ \
| * | Use shorter class-level File methods instead of going through File.stat.thedarkone2011-07-254-5/+5
| |/
* | Merge pull request #2236 from cldwalker/after_initializeSantiago Pastorino2011-07-253-2/+19
|\ \
| * | use existing model for testing Base.create with #after_initializeGabriel Horner2011-07-244-23/+12
| * | simplify and be more explicit about create and after_initialize testsGabriel Horner2011-07-242-24/+12
| * | fix after_initialize edge case (close #2074 and close #2175)Les Fletcher2011-07-244-2/+42
* | | Merge pull request #2254 from dmathieu/test_nameJosé Valim2011-07-251-2/+2
|\ \ \
| * | | provide more explicit test namesDamien Mathieu2011-07-251-2/+2
|/ / /
* | | Merge pull request #2247 from dmathieu/test_precompile_cachingJosé Valim2011-07-251-1/+11
|\ \ \
| * | | add test checking that precompiling assets performs cachingDamien Mathieu2011-07-251-1/+11
| | |/ | |/|
* | | Merge pull request #2251 from thedarkone/update-all-orderJosé Valim2011-07-252-9/+25
|\ \ \
| * | | Bring back the ability to provide :order for update_all.thedarkone2011-07-252-9/+25
| |/ /
* | | Merge pull request #2252 from thedarkone/polymorphic-url-helpersJosé Valim2011-07-254-9/+33
|\ \ \ | |/ / |/| |
| * | Make polymorphic_url calls go through application helpers again.thedarkone2011-07-254-9/+33
|/ /
* | Merge pull request #2238 from cesario/order-with-extra-spacesAaron Patterson2011-07-242-0/+5
|\ \
| * | Ordering with extra spaces was raising a SQL exceptionFranck Verrot2011-07-242-0/+5
| |/
* | Merge pull request #2243 from dmathieu/commentXavier Noria2011-07-241-0/+1
|\ \
| * | help the next guy with explanations - See bb3b3e306Damien Mathieu2011-07-241-0/+1
* | | Use top level Rails constantAndrew White2011-07-241-2/+2
* | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-2428-58/+66
|\ \ \ | |/ / |/| |
| * | little details seen while reviewingXavier Noria2011-07-241-2/+2
| * | Moved ActionController, ActionView and ActionDispatch sections under ActionPackJason Noble & Ralph Shnelvar2011-07-241-3/+3
| * | Add link to the Layouts and Rendering guide to explain more on view templatesJason Noble & Ralph Shnelvar2011-07-241-1/+3
| * | Modified the content based on vijaydev's commentJason Noble & Ralph Shnelvar2011-07-241-1/+1
| * | Update guide to be based on Rails 3.1.Jason Noble & Ralph Shnelvar2011-07-241-1/+1
| * | Added link to the RubyGems User's GuideJason Noble & Ralph Shnelvar2011-07-241-0/+1
| * | Added explanation to Components of Rails to help users not get hung up on det...Jason Noble & Ralph Shnelvar2011-07-241-1/+2
| * | Merge branch 'master' of https://github.com/lifo/docrailsKen Ip2011-07-241-5/+5
| |\ \
| | * | Added some context for rack apps, linked to the Rails on Rack guide.Jason Noble & Ralph Shnelvar2011-07-241-1/+1
| | * | Clarified notes in 3.2 Creating the Blog ApplicationMike Howard2011-07-241-3/+3
| | * | Changed wording of paragraph 2.1.1 Models to clarify table/modelMike Howard2011-07-241-1/+1
| * | | Update "Getting Started" for Rails 3.1Ken Ip2011-07-241-2/+6
| |/ /
| * | Revert "Tests now require MySQL2 adapter in order to run"Xavier Noria2011-07-241-2/+11
| * | Missed a few instances of British English spelling in the last commitOemuer Oezkir2011-07-243-3/+3
| * | Changed a few instances of of words in the API docs written in British Englis...Oemuer Oezkir2011-07-2415-26/+26
| * | Changing Textile emphasis underscores to em tags; the link with underscores t...Carol Nichols2011-07-231-1/+1
| * | Changed several instances of British English to be American EnglishEvan Farrar2011-07-238-10/+10
| * | Replaced ‘ with ' in the guides.Evan Farrar2011-07-232-7/+7
| * | Tests now require MySQL2 adapter in order to runJoe Fiorini2011-07-231-11/+2
| * | now the documentation reflects the actual returned value for a missing transl...gnagno2011-07-231-1/+1
* | | Merge pull request #1186 from mitijain123/duplicable_testSantiago Pastorino2011-07-241-7/+12
|\ \ \
| * | | Duplicable test is looking fine now.Mitesh Jain2011-07-241-7/+12
|/ / /
* | | Merge pull request #2239 from castlerock/scaffold_jquerySantiago Pastorino2011-07-241-0/+1
|\ \ \ | |_|/ |/| |
| * | Bringing back the jquery-rails. One test is dependent.Mitesh Jain2011-07-241-0/+1
|/ /
* | Merge pull request #2233 from gramos/fix-issue-1951-masterAaron Patterson2011-07-232-2/+30
|\ \