Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-29 | 20 | -142/+400 |
|\ | |||||
| * | 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 | 1 | -0/+56 |
| | | | | | | | | | | | | 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 | 2 | -25/+175 |
| | | | | | | | | | | | | Pratik Naik] 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 | 1 | -1/+1 |
| | | | | | | | | | | | | 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 | 1 | -1/+2 |
| | | | | | | | | | | | | 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 | 1 | -6/+3 |
| | | | | | | | | | | | | 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 | 2 | -4/+8 |
| | | |||||
| * | 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 | 1 | -0/+3 |
| | | | | | | | | 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 | 2 | -34/+23 |
| | | |||||
| * | Improve i18n support for number_to_human_size helper: | Yaroslav Markin | 2009-01-27 | 2 | -18/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 2 | -15/+47 |
| | | | | | | | | | | | | | | | | # Default locale app/views/messages/index.html.erb # I18n.locale is set to :da (Danish) app/views/messages/index.da.html.erb | ||||
| * | 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 | 1 | -1/+1 |
| | | |||||
| * | Add MiddlewareStack#swap | Joshua Peek | 2009-01-20 | 1 | -5/+10 |
| | | | | | | | | 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 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Restore cookie store httponly default to true. Remove extraneous dup of ↵ | Cody Fauser | 2009-01-20 | 1 | -3/+1 |
| | | | | | | | | | | | | 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 |
| | | |||||
| * | Merge docrails | Pratik Naik | 2009-01-18 | 6 | -72/+106 |
| | | |||||
* | | A small addition to the fragment caching documentation | Dimitri Krassovski | 2009-01-26 | 1 | -0/+7 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-18 | 20 | -570/+253 |
|\| | |||||
| * | Bump up the year in MIT license files | Pratik Naik | 2009-01-18 | 3 | -3/+3 |
| | | |||||
| * | 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 | 10 | -329/+186 |
| | | | | | | | | switch our multipart parser to use Racks. Moved XML, JSON, and YAML parsers into ActionController::ParamsParser middleware [#1661 state:resolved] | ||||
| * | 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 | 1 | -5/+5 |
| | | | | | | | | | | | | [Josh, Frederick Cheung] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
* | | quoted a couple of strings | Xavier Noria | 2009-01-18 | 1 | -2/+2 |
| | | |||||
* | | in depth revision of AssetTagHelper rdoc | Xavier Noria | 2009-01-18 | 1 | -44/+62 |
| | | |||||
* | | removed colons from an Options header | Xavier Noria | 2009-01-17 | 1 | -1/+1 |
| | | |||||
* | | reworded docs of AssetTagHelper, Mike helped here | Xavier Noria | 2009-01-17 | 1 | -8/+14 |
| | | |||||
* | | Remove version info | Pratik Naik | 2009-01-16 | 1 | -2/+0 |
| | | |||||
* | | Update route globbing documention in RDoc | Andrew White | 2009-01-15 | 1 | -3/+4 |
| | | |||||
* | | Use :secure key in session_options example instead of :session_secure | Cody Fauser | 2009-01-15 | 1 | -1/+1 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-14 | 10 | -319/+86 |
|\| | |||||
| * | 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 | 5 | -14/+32 |
| | | |||||
| * | Add RewindableInput wrapper to fix issues with middleware that impolitely ↵ | Joshua Peek | 2009-01-13 | 3 | -6/+48 |
| | | | | | | | | eat up non-rewindable input | ||||
| * | Explicitly read as binary in multipart_body for Windows [#1065 state:resolved] | Bryan Ash | 2009-01-13 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Use :key instead of old :session_key in session_store.rb generator and docs ↵ | Cody Fauser | 2009-01-13 | 1 | -3/+3 |
| | | | | | | | | | | | | [#1746 state:resovled] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Revert "HTTP Digest authentication [#1230 state:resolved]" | Pratik Naik | 2009-01-13 | 2 | -271/+2 |
| | | | | | | | | | | | | | | | | | | This reverts commit 45dee3842d68359a189fe7c0729359bd5a905ea4. Reasons : 1. The code is not working in it's current state 2. Should not be using exceptions for flow control | ||||
| * | Change Object#try to raise NoMethodError on private methods and always ↵ | Pratik Naik | 2009-01-13 | 1 | -1/+2 |
| | | | | | | | | return nil when Object is nil [Pratik Naik, Lawrence Pit] |