Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Temporarily reraise to simplify debugging | Yehuda Katz | 2009-03-17 | 1 | -0/+1 |
| | |||||
* | Working toward getting a basic AbstractController framework | Yehuda Katz | 2009-03-17 | 9 | -247/+244 |
| | |||||
* | Try to build a new AC::Base on top of AbstractController | Yehuda Katz | 2009-03-12 | 5 | -0/+416 |
| | |||||
* | Use extlib accessor for new callbacks | Yehuda Katz | 2009-03-12 | 1 | -2/+2 |
| | |||||
* | Move Abstract stuff to autoload | Yehuda Katz | 2009-03-12 | 2 | -5/+14 |
| | |||||
* | Handle nil QS | Yehuda Katz | 2009-03-12 | 1 | -1/+1 |
| | |||||
* | memoize correctly ;) | Yehuda Katz | 2009-03-03 | 1 | -2/+5 |
| | |||||
* | Helpers with an initial test | Yehuda Katz | 2009-03-03 | 8 | -44/+125 |
| | |||||
* | Callbacks test | Yehuda Katz | 2009-02-27 | 1 | -0/+217 |
| | |||||
* | Fixes multiple conditions | Yehuda Katz | 2009-02-27 | 2 | -4/+4 |
| | |||||
* | Add support for callbacks | Yehuda Katz | 2009-02-27 | 6 | -1/+1018 |
| | |||||
* | Initial hooks | Yehuda Katz | 2009-02-27 | 1 | -0/+5 |
| | |||||
* | AbstractController now supports layouts and rendering | Yehuda Katz | 2009-02-27 | 14 | -12/+151 |
| | |||||
* | First, very early, AbstractController code. More to come | Yehuda Katz | 2009-02-24 | 6 | -0/+190 |
| | |||||
* | Remove errant debug code | Yehuda Katz | 2009-02-03 | 1 | -2/+0 |
| | |||||
* | Make tests pass | Yehuda Katz | 2009-02-02 | 3 | -123/+2 |
| | |||||
* | Whoops. | Yehuda Katz | 2009-02-02 | 1 | -0/+40 |
| | |||||
* | Add support for pending | Yehuda Katz | 2009-02-02 | 3 | -9/+17 |
| | |||||
* | Merge commit 'rails/3-0-unstable' | Yehuda Katz | 2009-02-02 | 2 | -26/+0 |
|\ | |||||
| * | Remove dead cgi_ext require | Jeremy Kemper | 2009-01-31 | 1 | -1/+0 |
| | | |||||
| * | Remove duplicate ConcurrentHash | Jeremy Kemper | 2009-01-31 | 1 | -25/+0 |
| | | |||||
* | | Some merge cleanup | Yehuda Katz | 2009-02-02 | 6 | -15/+137 |
| | | |||||
* | | Merge commit 'rails/3-0-unstable' | Yehuda Katz | 2009-01-30 | 123 | -1122/+1437 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb | ||||
| * | Move dispatch related tests into test/dispatch | Joshua Peek | 2009-01-28 | 12 | -105/+111 |
| | | |||||
| * | Move HTTP libs and middleware into ActionDispatch component | Joshua Peek | 2009-01-27 | 44 | -427/+134 |
| | | |||||
| * | Reorganize ActionController folder structure | Joshua Peek | 2009-01-27 | 68 | -559/+976 |
| | | |||||
| * | Begin unifying the interface between ActionController and ActionView | Yehuda Katz | 2009-01-22 | 51 | -556/+759 |
| | | |||||
| * | Merge branch 'master' into 3-0-unstable | Joshua Peek | 2009-01-22 | 273 | -16821/+17130 |
| |\ | | | | | | | | | | | | | Conflicts: ci/cruise_config.rb | ||||
| * | | Update CI configuration to reflect latest gems. | Mike Gunderloy | 2009-01-07 | 4 | -9/+28 |
| | | | |||||
* | | | Merge branch 'master' of git@github.com:wycats/rails | Yehuda Katz | 2009-01-30 | 0 | -0/+0 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of git://github.com/rails/rails | lholden | 2009-01-21 | 151 | -14775/+12855 |
| |\ \ \ | |||||
* | \ \ \ | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-30 | 205 | -14977/+14070 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | 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] |