aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | updated test_should_record_timestamp_for_join_table for OracleRaimonds Simanovskis2010-08-221-1/+1
| |
* | Bump up rack-mount to 0.6.12Santiago Pastorino2010-08-222-2/+2
|/
* 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 ↵Andrew White2010-08-223-3/+29
| | | | | | | | | | | | | | | | | | | | | | request object rather than the environment hash. This it to prevent stale parameters in later routing constraints/redirects as only the normal path parameters are set by Rack::Mount. Also if a constraint proc arity is more than one, pass the symbolized path parameters as the first argument to match redirect proc args and provide easier access. [#5157 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * 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
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * 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
| | | | | | | | | | | | environment." This reverts commit 6b29dc876fe185881d46731c3ae170478a3828fe.
| * 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
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Support routing constraints in functional testsAndrew White2010-08-203-17/+40
| | | | | | | | | | | | | | | | | | | | Extend assert_recognizes and assert_generates to support passing full urls as the path argument. This allows testing of routing constraints such as subdomain and host within functional tests. [#5005 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * 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
|/ | | | since Rails::LogSubscriber doesn't seem to be defined anymore
* 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
| | | | | | | | | | | | | | | | I confirmed that this is the behavior on 2.3.x . [5419 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Don't add the standard https port when using redirect in routes.rb and ↵Andrew White2010-08-204-1/+65
| | | | | | | | | | | | | | | | ensure that request.scheme returns https when using a reverse proxy. [#5408 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Allow symbols for :path resource(s) option [#5306 state:resolved]Andrew White2010-08-202-2/+21
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * 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
| | | | | | | | | | | | [#5403] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * 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 ↵Andrew White2010-08-192-0/+26
| | | | | | | | | | | | into the scope [#5208 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Move edit route before show route so that it will have precedence if the :id ↵Andrew White2010-08-192-2/+18
| | | | | | | | | | | | parameter allows slashes [#5409 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * While creating a new record using has_many create method default scope of ↵Neeraj Singh2010-08-196-5/+45
| | | | | | | | | | | | | | | | | | | | | | child should be respected. author.posts.create should take into account default_scope defined on post. [#3939: state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * 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 ↵Xavier Noria2010-08-192-4/+7
| | | | | | | | activesupport/lib/active_support/dependencies.rb:239: warning: loading in progress, circular require considered harmful ... activesupport/lib/active_support/core_ext/hash/indifferent_access.rb while running the suite in Ruby 1.9.2
| * get rid of the warning "+ after local variable is interpreted as binary ↵Xavier Noria2010-08-191-13/+13
| | | | | | | | operator even though it seems like unary operator" in Ruby 1.9.2
| * Revert "It's snowing!"wycats2010-08-183-3/+3
| | | | | | | | This reverts commit e4283007d607454acf97301821ba1e1c417bdead.
| * 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
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Bump up rdoc to 2.5.10Santiago Pastorino2010-08-189-9/+9
| |
| * run the AS tests in verbose modeAaron Patterson2010-08-171-0/+1
| |
| * 1.8 block variable shadowing strikes againwycats2010-08-171-2/+2
| |
| * Sadly, this segv's in 1.8 :(wycats2010-08-172-43/+61
| |