aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Use symbols when specifying custom resource actions"Andrew White2010-08-241-4/+4
* touch operationg if used along with belongs_to will also be invoked on associ...Neeraj Singh2010-08-241-2/+6
* Use symbols when specifying custom resource actionsAndrew White2010-08-241-4/+4
* Note about how to exit the console in the Getting Started guideTrevor Turk2010-08-241-0/+2
* unscoped does not work when chained with named_scopeNeeraj Singh2010-08-231-0/+5
* Merge remote branch 'rails/master'Xavier Noria2010-08-2320-67/+132
|\
| * Silence warnings for Encoding.default_external= and Encoding.default_internal=Santiago Pastorino2010-08-223-8/+18
| * Cache the symbolized path parameters using a instance variable in the request...Andrew White2010-08-223-3/+29
| * Set default_internal and default_external on AS for testing purposesSantiago Pastorino2010-08-221-0/+8
| * Set default_internal and default_external on AM for testing purposesSantiago Pastorino2010-08-211-1/+8
| * Move encoding settings for testing purposes to abstract_unit fileSantiago Pastorino2010-08-212-9/+6
| * Trifling typosRaphomet2010-08-213-5/+5
| * reload bob after his journy to a new timezoneBrian Lopez2010-08-201-0/+1
| * Revert "Just add connection management middleware if running in a concurrent ...Jeremy Kemper2010-08-203-19/+7
| * prevent RDoc from autolinking "Rails" in the API home pageXavier Noria2010-08-211-8/+8
| * requires horo 1.0.2Xavier Noria2010-08-211-1/+1
| * Fix hash modification during iteration in Mapper [#5420]Nick Sieger2010-08-201-1/+1
| * Support routing constraints in functional testsAndrew White2010-08-203-17/+40
| * adding FOUND_ROWS to the connect flags for mysql2Aaron Patterson2010-08-201-0/+5
* | type fixedSantiago Pastorino2010-08-221-1/+1
* | Fix docs to reference ActiveRecord::LogSubscriberEvgeniy Dolzhenko2010-08-211-1/+1
|/
* Merge remote branch 'rails/master'Xavier Noria2010-08-2047-276/+401
|\
| * after_validation should be called irrespective of the result of validation.Neeraj Singh2010-08-203-1/+12
| * Don't add the standard https port when using redirect in routes.rb and ensure...Andrew White2010-08-204-1/+65
| * Allow symbols for :path resource(s) option [#5306 state:resolved]Andrew White2010-08-202-2/+21
| * deletes the rdoc task of each component, they are no longer published separatelyXavier Noria2010-08-207-129/+0
| * the pdoc task is no longer neededXavier Noria2010-08-201-6/+0
| * fisting after_rollback and after commit callbacksAaron Patterson2010-08-203-6/+15
| * Bump up tzinfo to 0.3.23Santiago Pastorino2010-08-203-3/+3
| * updates return number of rows matched rather than number of rows affectedAaron Patterson2010-08-191-0/+1
| * Optimize find_sti_class when store_full_sti_class is trueAndrew White2010-08-191-1/+5
| * Use attribute readers as they are faster in general.José Valim2010-08-191-8/+2
| * Move regexps in options hash to :constraints hash so that they are pushed int...Andrew White2010-08-192-0/+26
| * Move edit route before show route so that it will have precedence if the :id ...Andrew White2010-08-192-2/+18
| * While creating a new record using has_many create method default scope of chi...Neeraj Singh2010-08-196-5/+45
| * Bump up rack-mount to 0.6.10Santiago Pastorino2010-08-192-2/+2
| * removing useless ternaryAaron Patterson2010-08-192-2/+2
| * we should wrap strings as sql literalsAaron Patterson2010-08-191-1/+1
| * We need bundle update only hereSantiago Pastorino2010-08-191-1/+1
| * Memoize STI class lookups for the duration of a requestJeremy Kemper2010-08-192-3/+3
| * refactor if / else to ||=Aaron Patterson2010-08-181-5/+1
| * avoids warnings about mismatched indentations in Ruby 1.9.2Xavier Noria2010-08-192-9/+6
| * now for real, the suite loads everything and these went unpatchedXavier Noria2010-08-191-3/+3
| * avoids a ton o warnings activesupport/lib/active_support/dependencies.rb:239:...Xavier Noria2010-08-192-4/+7
| * get rid of the warning "+ after local variable is interpreted as binary opera...Xavier Noria2010-08-191-13/+13
| * Revert "It's snowing!"wycats2010-08-183-3/+3
| * refactoring to remove duplicate logicAaron Patterson2010-08-181-4/+3
| * call to present? is not necessaryAaron Patterson2010-08-181-2/+1
| * Don't pluralize resource methods [#4704 state:resolved]Javier Martín2010-08-182-14/+76
| * Bump up rdoc to 2.5.10Santiago Pastorino2010-08-189-9/+9