aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | - added ActionView::PartialRenderer#merge_path_into_partial(path, partial)Gaston Ramos2011-07-242-3/+17
| * | - added test case for issue:Gaston Ramos2011-07-241-0/+14
* | | just use normal ruby for stubbingAaron Patterson2011-07-231-5/+3
|/ /
* | Merge pull request #2185 from castlerock/lazy_load_abstract_adapterAaron Patterson2011-07-232-3/+2
|\ \
| * | lazy load ConnectionAdapters remove require.Vishnu Atrai2011-07-222-3/+2
* | | Merge pull request #2228 from Empact/helper_tags_in_mailersAaron Patterson2011-07-232-1/+2
|\ \ \
| * | | Simple fix to the NoMethodError noted in #2177.Ben Woosley2011-07-232-1/+2
* | | | simplify singleton_class? methodAaron Patterson2011-07-231-7/+1
* | | | Merge pull request #2226 from dmathieu/perform_cachingAaron Patterson2011-07-231-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | rake assets:precompile should always perform caching - Closes #2199Damien Mathieu2011-07-241-0/+1
|/ / /
* | | Remove unused gems from GemfileSantiago Pastorino2011-07-231-4/+0
* | | Merge pull request #2221 from grzuy/masterSantiago Pastorino2011-07-232-1/+8
|\ \ \
| * | | Fix ActiveSupport::Cache::FileStore#file_path_key does not work if initialize...Gonzalo Rodriguez2011-07-232-1/+8
|/ / /