Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Some merge cleanup | Yehuda Katz | 2009-02-02 | 5 | -15/+16 |
| | |||||
* | Merge commit 'rails/3-0-unstable' | Yehuda Katz | 2009-01-30 | 114 | -1091/+1303 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 43 | -426/+133 |
| | | |||||
| * | Reorganize ActionController folder structure | Joshua Peek | 2009-01-27 | 65 | -558/+936 |
| | | |||||
| * | Begin unifying the interface between ActionController and ActionView | Yehuda Katz | 2009-01-22 | 34 | -485/+611 |
| | | |||||
* | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-30 | 64 | -907/+1446 |
|\ \ | |||||
| * | | 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> | ||||
| * | | Move basic auth test controller inside the test class | Pratik Naik | 2009-01-29 | 1 | -21/+21 |
| | | | |||||
| * | | 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 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> | ||||
| * | | 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 |
| | | | |||||
| * | | 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 |
| | | | |||||
| * | | Dont use Memoizable for ActionController::Request | Pratik Naik | 2009-01-27 | 4 | -76/+65 |
| | | | |||||
| * | | Improve i18n support for number_to_human_size helper: | Yaroslav Markin | 2009-01-27 | 4 | -23/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * now using pluralization properly * storage unit translations moved to number.human.storage_units.units * introduced number.human.storage_units.format for languages that do not follow "{{number}} {{unit}}" format (Japanese) NOTE: I18n table changed, you will need to update your translations. [#1634 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | Ensure the full path is used when searching for layouts [#1803 state:resolved] | Joshua Peek | 2009-01-27 | 1 | -1/+1 |
| | | | |||||
| * | | Fix for failing ActionMailer multipart tests | Joshua Peek | 2009-01-26 | 1 | -2/+2 |
| | | | |||||
| * | | Add localized templates | Joshua Peek | 2009-01-25 | 5 | -15/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | # Default locale app/views/messages/index.html.erb # I18n.locale is set to :da (Danish) app/views/messages/index.da.html.erb | ||||
| * | | Remove the irrelevant fixture added in fe6ffce51dc16285094be49244b26591956c2dd6 | Pratik Naik | 2009-01-24 | 1 | -8/+0 |
| | | | |||||
| * | | Make sure inner scope conditions get a preference over the outer ones | Pratik Naik | 2009-01-24 | 1 | -1/+9 |
| |/ | |||||
| * | Setup ActiveRecord QueryCache middleware in the initializer | Joshua Peek | 2009-01-21 | 1 | -5/+3 |
| | | |||||
| * | Missed RequestParser in ff0a267 | Joshua Peek | 2009-01-21 | 1 | -1/+0 |
| | | |||||
| * | Allow empty files to be uploaded | Joshua Peek | 2009-01-20 | 4 | -4/+22 |
| | | |||||
| * | Add MiddlewareStack#swap | Joshua Peek | 2009-01-20 | 2 | -5/+16 |
| | | | | | | | | config.middleware.swap ActionController::Session::CookieStore, MySessionStore | ||||
| * | Don't let empty Tempfiles come through as uploaded files [#1785 state:resolved] | Mislav Marohnić | 2009-01-20 | 3 | -1/+17 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Restore cookie store httponly default to true. Remove extraneous dup of ↵ | Cody Fauser | 2009-01-20 | 2 | -5/+3 |
| | | | | | | | | | | | | options on initialization [#1784 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Deprecate ActionController::Base#session_enabled? | Pratik Naik | 2009-01-19 | 1 | -1/+1 |
| | | |||||
| * | Improve HTTP Basic authentication tests | Pratik Naik | 2009-01-18 | 2 | -54/+88 |
| | | |||||
| * | Merge docrails | Pratik Naik | 2009-01-18 | 6 | -72/+106 |
| | | |||||
| * | Bump up the year in MIT license files | Pratik Naik | 2009-01-18 | 4 | -4/+4 |
| | | |||||
| * | Remove script/performance/profiler in favour of performance integration tests. | Pratik Naik | 2009-01-18 | 1 | -168/+0 |
| | | | | | | | | | | | | To continue using script/performance/profiler, install the request_profiler plugin : script/plugin install git://github.com/rails/request_profiler.git | ||||
| * | Build query string and POST params parser on top of Rack::Request. Also ↵ | Joshua Peek | 2009-01-17 | 12 | -333/+190 |
| | | | | | | | | switch our multipart parser to use Racks. Moved XML, JSON, and YAML parsers into ActionController::ParamsParser middleware [#1661 state:resolved] | ||||
| * | Add test coverage for fixing Safari 2 trailing null character | Joshua Peek | 2009-01-17 | 1 | -0/+12 |
| | | |||||
| * | Ensure any method sent to RewindableIO reads the original IO object [#1767 ↵ | Joshua Peek | 2009-01-17 | 2 | -25/+9 |
| | | | | | | | | state:resolved] | ||||
| * | Lock middleware has been committed upstream | Joshua Peek | 2009-01-17 | 6 | -40/+46 |
| | | |||||
| * | Fix performance regression | Jeremy Kemper | 2009-01-16 | 2 | -2/+6 |
| | | |||||
| * | Skip respond_to check so rack.input doesn't have to implement it | Jeremy Kemper | 2009-01-16 | 1 | -2/+2 |
| | | |||||
| * | Fix date_select within fields_for with an index [#1666 state:resolved] ↵ | Josh | 2009-01-16 | 2 | -20/+85 |
| | | | | | | | | | | | | [Josh, Frederick Cheung] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
* | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-14 | 9 | -42/+35 |
|\| | |||||
| * | Use Rack's MethodOverride lib [#1699 state:resolved] | Joshua Peek | 2009-01-13 | 3 | -26/+1 |
| | | |||||
| * | Update multipart tests to expose (another) bug in Rack's multipart parser | Joshua Peek | 2009-01-13 | 7 | -16/+34 |
| | | |||||
* | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-13 | 5 | -8/+128 |
|\| |