Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Update ci config to use mocha 0.9.5 | Jeremy Kemper | 2009-02-03 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-02-03 | 146 | -43584/+0 | |
|\ | ||||||
| * | Remove all the existing asciidoc guides | Pratik Naik | 2009-02-04 | 146 | -43774/+0 | |
| | | ||||||
| * | Merge docrails | Pratik Naik | 2009-02-03 | 10 | -91/+281 | |
| | | ||||||
* | | Ruby 1.9: force ascii encoding for comparison with utf8 regexp | Jeremy Kemper | 2009-02-03 | 1 | -0/+2 | |
| | | ||||||
* | | Bump mocha requirement for Ruby 1.9 compat. Remove uses_mocha. | Jeremy Kemper | 2009-02-03 | 41 | -3691/+3559 | |
|/ | ||||||
* | Workaround jruby issue with protected module attr_accessor showing up as ↵ | Jeremy Kemper | 2009-02-02 | 1 | -2/+7 | |
| | | | | public in included class | |||||
* | Don't assume ActiveRecord is available | Jeremy Kemper | 2009-02-02 | 1 | -8/+13 | |
| | ||||||
* | Added localized rescue (404.da.html) [#1835 state:committed] | José Valim | 2009-02-02 | 4 | -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 Naik | 2009-02-02 | 1 | -1/+1 | |
| | | | | included | |||||
* | Mark CHANGELOGs for release | David Heinemeier Hansson | 2009-02-01 | 6 | -5/+10 | |
| | ||||||
* | Merge docrails | Pratik Naik | 2009-02-01 | 31 | -952/+4704 | |
| | ||||||
* | Add Rails Guides to the default links on generated index.html [#1839 ↵ | Mike Gunderloy | 2009-02-01 | 1 | -0/+1 | |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | Add :reconnect option to generated mysql database.yml [#1838 state:resolved] | Mike Gunderloy | 2009-02-01 | 1 | -0/+3 | |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | Use Rack::Head middleware to ensure the body is discarded for HEAD requests | Joshua Peek | 2009-02-01 | 3 | -0/+18 | |
| | ||||||
* | Remove ancient tests for CGI parsing bug | Joshua Peek | 2009-01-31 | 1 | -30/+0 | |
| | ||||||
* | Removed Prototype specific Safari 2 AJAX hack. | Joshua Peek | 2009-01-31 | 2 | -7/+0 | |
| | | | | The normal null character stripper is still there. | |||||
* | Don't rely on the order in these tests | Michael Koziarski | 2009-02-01 | 1 | -2/+2 | |
| | ||||||
* | validate_length_of should use custom message if given when using in or within. | miloops | 2009-02-01 | 2 | -5/+17 | |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1057 state:committed] | |||||
* | Removed map.resources :only/:except inheritance | Tarmo Tänav | 2009-02-01 | 2 | -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 Duran | 2009-02-01 | 21 | -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 Kemper | 2009-01-31 | 1 | -1/+5 | |
| | | | | String headers and bodies | |||||
* | Fix unsorted array comparison | Jeremy Kemper | 2009-01-31 | 2 | -2/+2 | |
| | ||||||
* | Ruby 1.9 compat: work around that String is not Enumerable | Jeremy Kemper | 2009-01-31 | 2 | -2/+6 | |
| | ||||||
* | Make sure XmlMini is being correctly autoloaded by Ruby 1.9.1 | Luca Guidi | 2009-01-31 | 1 | -90/+92 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Ensure constant_watch_stack is protected by a mutex, so concurrent requires ↵ | Charles Nutter | 2009-01-30 | 1 | -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 Taylor | 2009-01-29 | 2 | -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 Gaffney | 2009-01-29 | 1 | -0/+58 | |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
* | Digest#validate_digest_response should accept request instead of controller | Pratik Naik | 2009-01-29 | 1 | -6/+6 | |
| | ||||||
* | Added grouped_options_for_select helper method for wrapping option tags in ↵ | Jon Crawford | 2009-01-29 | 3 | -0/+84 | |
| | | | | | | optgroups. [#977 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | Implement HTTP Digest authentication. [#1230 state:resolved] [Gregg Kellogg, ↵ | Gregg Kellogg | 2009-01-29 | 4 | -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 Dunphy | 2009-01-29 | 3 | -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 server | Michael Koziarski | 2009-01-29 | 1 | -2/+2 | |
| | ||||||
* | Only dup local cache values if duplicable [#1653 state:resolved] | Joshua Peek | 2009-01-28 | 2 | -1/+13 | |
| | ||||||
* | Move basic auth test controller inside the test class | Pratik Naik | 2009-01-29 | 1 | -21/+21 | |
| | ||||||
* | Improve exception handling when Location header is invalid. [#1192 ↵ | Bob Aman | 2009-01-28 | 2 | -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 Weinand | 2009-01-28 | 2 | -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" Slagter | 2009-01-28 | 2 | -1/+11 | |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | Added options to script/dbconsole to sqlite3 console in various different ↵ | Bryan Ray | 2009-01-28 | 1 | -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 Pandey | 2009-01-28 | 2 | -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ño | 2009-01-28 | 2 | -1/+18 | |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | Ensure that when UrlWriter is included in multiple classes, the ↵ | Nathan de Vries | 2009-01-28 | 2 | -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 Naik | 2009-01-28 | 2 | -2/+24 | |
| | | | | [Carlos Júnior] | |||||
* | Session cookie header should always be set if :expire_after option is specified | Pratik Naik | 2009-01-28 | 3 | -8/+40 | |
| | ||||||
* | Use toplevel reference to ::StringIO since we're in a BasicObject. | Jeremy Kemper | 2009-01-27 | 1 | -2/+2 | |
| | ||||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2009-01-27 | 3 | -3/+5 | |
|\ | ||||||
| * | Disable eager loading for all rake tasks [#802 state:resolved] | Joshua Peek | 2009-01-27 | 3 | -3/+5 | |
| | | ||||||
* | | Fix for sweepers method_missing missing &block argument [#1581 status:committed] | Tys von Gaza | 2009-01-27 | 1 | -2/+2 | |
|/ | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | |||||
* | Restore implicit rendering for XHR requests that want a HTML template [#1590 ↵ | Joshua Peek | 2009-01-27 | 3 | -0/+12 | |
| | | | | state:resolved] | |||||
* | Fixed deprecated methods on TestSession [#1801 state:resolved] | Joshua Peek | 2009-01-27 | 2 | -17/+21 | |
| |