aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update ci config to use mocha 0.9.5Jeremy Kemper2009-02-031-1/+1
|
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-02-03146-43584/+0
|\
| * Remove all the existing asciidoc guidesPratik Naik2009-02-04146-43774/+0
| |
| * Merge docrailsPratik Naik2009-02-0310-91/+281
| |
* | Ruby 1.9: force ascii encoding for comparison with utf8 regexpJeremy Kemper2009-02-031-0/+2
| |
* | Bump mocha requirement for Ruby 1.9 compat. Remove uses_mocha.Jeremy Kemper2009-02-0341-3691/+3559
|/
* Workaround jruby issue with protected module attr_accessor showing up as ↵Jeremy Kemper2009-02-021-2/+7
| | | | public in included class
* Don't assume ActiveRecord is availableJeremy Kemper2009-02-021-8/+13
|
* Added localized rescue (404.da.html) [#1835 state:committed]José Valim2009-02-024-5/+42
| | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Template#mime_type should not use Mime::Type when Action Controller is not ↵Pratik Naik2009-02-021-1/+1
| | | | included
* Mark CHANGELOGs for releaseDavid Heinemeier Hansson2009-02-016-5/+10
|
* Merge docrailsPratik Naik2009-02-0131-952/+4704
|
* Add Rails Guides to the default links on generated index.html [#1839 ↵Mike Gunderloy2009-02-011-0/+1
| | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Add :reconnect option to generated mysql database.yml [#1838 state:resolved]Mike Gunderloy2009-02-011-0/+3
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Use Rack::Head middleware to ensure the body is discarded for HEAD requestsJoshua Peek2009-02-013-0/+18
|
* Remove ancient tests for CGI parsing bugJoshua Peek2009-01-311-30/+0
|
* Removed Prototype specific Safari 2 AJAX hack.Joshua Peek2009-01-312-7/+0
| | | | The normal null character stripper is still there.
* Don't rely on the order in these testsMichael Koziarski2009-02-011-2/+2
|
* validate_length_of should use custom message if given when using in or within.miloops2009-02-012-5/+17
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1057 state:committed]
* Removed map.resources :only/:except inheritanceTarmo Tänav2009-02-012-31/+47
| | | | | | | | | | It's very rare for these options to apply identically to nested child resources, and with this inheritance on it's very difficult to have a child resource with more actions than the parent. This reverts commit 2ecec6052f7f290252a9fd9cc27ec804c7aad36c. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1826 state:committed]
* Add support for nested object forms to ActiveRecord and the helpers in ↵Eloy Duran2009-02-0121-58/+1687
| | | | | | | | ActionPack Signed-Off-By: Michael Koziarski <michael@koziarski.com> [#1202 state:committed]
* Ruby 1.9 compat: omit Rack::Lint from integration tests until it accepts ↵Jeremy Kemper2009-01-311-1/+5
| | | | String headers and bodies
* Fix unsorted array comparisonJeremy Kemper2009-01-312-2/+2
|
* Ruby 1.9 compat: work around that String is not EnumerableJeremy Kemper2009-01-312-2/+6
|
* Make sure XmlMini is being correctly autoloaded by Ruby 1.9.1Luca Guidi2009-01-311-90/+92
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Ensure constant_watch_stack is protected by a mutex, so concurrent requires ↵Charles Nutter2009-01-301-5/+14
| | | | | | | | do not corrupt it. [#1816 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Controller, response, and request should all refer to same session, even ↵Scott Taylor2009-01-292-4/+42
| | | | | | after a call to session_reset [#1823 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Deprecation tests for f17c876 [#1801 state:resolved]Mike Gaffney2009-01-291-0/+58
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Digest#validate_digest_response should accept request instead of controllerPratik Naik2009-01-291-6/+6
|
* Added grouped_options_for_select helper method for wrapping option tags in ↵Jon Crawford2009-01-293-0/+84
| | | | | | optgroups. [#977 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Implement HTTP Digest authentication. [#1230 state:resolved] [Gregg Kellogg, ↵Gregg Kellogg2009-01-294-25/+326
| | | | | | Pratik Naik] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Sqlite adapter's copy_table incorrectly attempts to recreate a primary key ↵Jacob Dunphy2009-01-293-1/+17
| | | | | | | | | id (:id => true in the create_table) if an :id column is present, even if it isn't a primary_key. This fix sets :id => false if there is an :id column, but it's not the primary_key. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1766 state:committed]
* Move to use pg instead of postgres on the CI serverMichael Koziarski2009-01-291-2/+2
|
* Only dup local cache values if duplicable [#1653 state:resolved]Joshua Peek2009-01-282-1/+13
|
* Move basic auth test controller inside the test classPratik Naik2009-01-291-21/+21
|
* Improve exception handling when Location header is invalid. [#1192 ↵Bob Aman2009-01-282-2/+15
| | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Using the highlight helper on text with html shouldn't highlight text inside ↵Dan Weinand2009-01-282-1/+24
| | | | | | html attributes. [#1302 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Ensure whitespaces are stripped when merging string joins. [#1297 ↵Filip H.F. "FiXato" Slagter2009-01-282-1/+11
| | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Added options to script/dbconsole to sqlite3 console in various different ↵Bryan Ray2009-01-281-1/+17
| | | | | | modes. [#607 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* ActiveResource#eqls? and == should not take into account object identity and ↵Rasik Pandey2009-01-282-2/+11
| | | | | | prefix options should be considered. [#1098 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Ensure selected option is not ignored for collection_select. [#1037 ↵Daniel Rodríguez Troitiño2009-01-282-1/+18
| | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Ensure that when UrlWriter is included in multiple classes, the ↵Nathan de Vries2009-01-282-7/+19
| | | | | | default_url_options of one don't affect the other. [#1277 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Add array id support to Model.update_counters. [#1254 state:resolved] ↵Pratik Naik2009-01-282-2/+24
| | | | [Carlos Júnior]
* Session cookie header should always be set if :expire_after option is specifiedPratik Naik2009-01-283-8/+40
|
* Use toplevel reference to ::StringIO since we're in a BasicObject.Jeremy Kemper2009-01-271-2/+2
|
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2009-01-273-3/+5
|\
| * Disable eager loading for all rake tasks [#802 state:resolved]Joshua Peek2009-01-273-3/+5
| |
* | Fix for sweepers method_missing missing &block argument [#1581 status:committed]Tys von Gaza2009-01-271-2/+2
|/ | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Restore implicit rendering for XHR requests that want a HTML template [#1590 ↵Joshua Peek2009-01-273-0/+12
| | | | state:resolved]
* Fixed deprecated methods on TestSession [#1801 state:resolved]Joshua Peek2009-01-272-17/+21
|