aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge remote branch 'rails/master'Xavier Noria2010-07-3119-56/+99
|\
| * README.rdoc is your first impression, make sure it is cleanXavier Noria2010-07-311-10/+19
| * reverting where() functionality, adding a testAaron Patterson2010-07-302-4/+9
| * fewer method calls, using faster methods when possibleAaron Patterson2010-07-301-5/+5
| * reducing function calls and using faster methods for testingAaron Patterson2010-07-302-16/+10
| * if there's a Gemfile and doc:guides can't load RedCloth, print instructions f...Xavier Noria2010-07-301-1/+20
| * the main page of the API generated by the doc:rails task is READMEXavier Noria2010-07-301-1/+1
| * AS gem doesn't depend on nokogiri so shows a nicer error if users haven't ins...Santiago Pastorino2010-07-302-3/+13
| * Make options an attr_readerSantiago Pastorino2010-07-301-6/+1
| * fix for rails app generator when using --pretend optionSteve Agalloco2010-07-302-1/+7
| * Add another missing require in 'active_support/inflector/inflections'Carl Lerche2010-07-291-0/+1
| * Bump up bundler version to rc.2Santiago Pastorino2010-07-293-3/+3
| * This version is going to be outdated when new nokogiri versions are releasedSantiago Pastorino2010-07-292-2/+2
| * Bump up nokogiri to 1.4.3.1Santiago Pastorino2010-07-292-3/+3
| * Don't increment and then decrement the same counter when re-assigning a belon...Tarmo Tänav2010-07-292-1/+5
* | returns not returned . fixing documentation for reflectionNeeraj Singh2010-07-301-28/+30
* | Command Line Guide: changes all 'rails app' commands to 'rails new app'Arkadiusz Holko2010-07-301-6/+6
* | API Docs: Use 'HTTP_AUTHORIZATION' and not :authorize as key in integration t...Rohit Arondekar2010-07-301-1/+1
|/
* Merge remote branch 'rails/master'Xavier Noria2010-07-3071-172/+303
|\
| * edit pass to apply API guideline wrt the use of "# =>" in example codeXavier Noria2010-07-3019-103/+104
| * got the ternary backwards. somehow the sqlite tests passed!Aaron Patterson2010-07-291-1/+1
| * PERF: avoiding splat args and reducing function callsAaron Patterson2010-07-291-8/+5
| * link_to_function now expects a piece of javascript code for the onclick param...Rodrigo Dominguez2010-07-291-4/+5
| * Add a missing require in 'active_support/core_ext/string/inflections'Carl Lerche2010-07-291-0/+1
| * Revert "Avoid uneeded queries in session stores if sid is not given."José Valim2010-07-293-5/+4
| * Shouldn't have committed this! Revert "avoid calling to_sql twice"Aaron Patterson2010-07-281-7/+4
| * avoid calling to_sql twiceAaron Patterson2010-07-281-4/+7
| * adding test for respond_to cache_key and cleaning up the ENV settingsNeeraj Singh2010-07-281-14/+33
| * test cases for rails_app_version in AS cache.rbNeeraj Singh2010-07-281-0/+14
| * adding more test cases for expand_cache_keyNeeraj Singh2010-07-281-0/+10
| * removing unused variableNeeraj Singh2010-07-281-2/+0
| * Fix middleware testwycats2010-07-271-1/+2
| * slight performance improvement when grabbing an arel tableAaron Patterson2010-07-271-1/+1
| * fixed joining of attributes when using find_or_create_by with multiple attrib...Jon Buda2010-07-282-1/+10
| * Forgot to check in this new filewycats2010-07-271-0/+13
| * Add a header that tells Internet Explorer (all versions) to use the best avai...wycats2010-07-276-3/+7
| * adds test coverage for edge-cases of Array.wrap, and better documentation for...Xavier Noria2010-07-283-5/+37
| * Fix app generator so that it uses the right app_name during rails:update rake...rohit2010-07-271-1/+1
| * This is a hash in 1.9.2Santiago Pastorino2010-07-261-1/+1
| * fix bad logic in determining if in rails app subdirChad Fowler2010-07-261-1/+2
| * Fix deprecation message on info screenDavid Heinemeier Hansson2010-07-261-1/+1
| * JRuby should not need system_timer, and cannot install it eitherNick Sieger2010-07-261-1/+0
| * Add install script for testing gems locallyDavid Heinemeier Hansson2010-07-261-0/+11
| * Spaces, people, spaces!David Heinemeier Hansson2010-07-261-0/+1
| * Make Rails 3 RC depend on Bundler RCDavid Heinemeier Hansson2010-07-261-1/+1
| * missing requires addedSantiago Pastorino2010-07-261-0/+2
| * Rails version updateDavid Heinemeier Hansson2010-07-261-1/+1
| * Prep for RCDavid Heinemeier Hansson2010-07-2615-13/+23
| * Move runtime back to the Thread.currentJosé Valim2010-07-264-13/+21
| * fixing space errorsAaron Patterson2010-07-262-6/+6