aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * Merge branch 'master' into mysql2Brian Lopez2010-08-0230-56/+291
| | | |\ | | |_|/ | |/| |
| * | | Bring returning back to ease migration.José Valim2010-08-022-0/+44
| * | | Remove duplicated logic.José Valim2010-08-021-7/+9
| * | | Eager loading an association should not change the count of childrenNeeraj Singh2010-08-026-0/+42
| * | | fix loading of different elements in array then int and string [#5036 state:r...Josef Reidinger2010-08-022-3/+15
| * | | Tidy up previous commit.José Valim2010-08-023-18/+16
| * | | test and fix collection_singular_ids= with string primary keys [#5125 state:r...Robert Pankowecki2010-08-024-3/+46
| * | | Handle edge cases in the previous patch.José Valim2010-08-021-1/+2
| * | | Improved how AppGenerator generates the application name. It now detects the ...Fred Wu2010-08-022-1/+29
| * | | ActiveModel::Errors json serialization to work as Rails 3b4 [#5254 state:reso...Alex Le2010-08-023-6/+22
| * | | Add missing require in ActiveSupport::HashWithIndifferentAccess [#5189 state:...Chris Hoffman2010-08-021-0/+1
| * | | Merge branch 'master' of github.com:rails/railsJosé Valim2010-08-022-1/+16
| |\ \ \
| | * | | Makes rails destroy scaffold don't duplicate routes.draw do |map| |map| when ...Santiago Pastorino2010-08-021-1/+1
| | * | | Failing test to check for route file corruption if legacy map parameter is us...rohit2010-08-021-0/+15
| * | | | Add an internal (private API) after_touch callback. [#5271 state:resolved]José Valim2010-08-025-19/+24
| * | | | added failing touch propagation testJakub Kuźma2010-08-022-0/+19
| |/ / /
| * | | Corrected the rake test:units and test:functionals description [#5251 state:c...Prashant P. Shah2010-08-011-1/+1
| * | | Use AS::OrderedHash when trusting in the order of the hashSantiago Pastorino2010-08-011-2/+3
| * | | Fix label form helper to use I18n and html options, without the need of 'nil'...Carlos Antonio da Silva2010-08-012-5/+13
| | | * typoBrian Lopez2010-08-021-1/+1
| | | * update tests for mysql2 supportBrian Lopez2010-08-0217-26/+467
| | |/ | |/|
| * | Makes form_helper use overriden model accessorsSantiago Pastorino2010-08-012-3/+20
| * | explains Array.wrap directly, rather by comparison with Kernel#Array which is...Xavier Noria2010-08-012-4/+48
| * | DHH forgot to remove JS, CSS in generated index.html [#5261 state:resolved]Johan Lundström2010-07-311-23/+0
| * | fixes typoXavier Noria2010-07-311-1/+1
| * | use the same amount of left indent in all code blocks of README.rdocXavier Noria2010-07-311-2/+2
| |/
| * 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