aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* distance_of_time_in_words: Add/tweak comments to understand time intervals ↵Elliot Winkler2012-04-302-18/+32
| | | | better
* distance_of_time_in_words: 45-60 days is about 2 months, not about 1 monthElliot Winkler2012-04-302-3/+6
|
* Merge pull request #5705 from lest/patch-3Jeremy Kemper2012-04-302-1/+10
|\ | | | | split CDATA end token in cdata_section helper
| * split CDATA end token in cdata_section helperSergey Nartimov2012-04-302-1/+10
| |
* | Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_storesJosé Valim2012-04-302-0/+14
|\ \ | | | | | | Support cookie jar options for all cookie stores
| * | Support cookie jar options for all cookie storesbrainopia2012-04-302-0/+14
| | |
* | | Merge pull request #6082 from brainopia/smarter_cookie_jarJosé Valim2012-04-302-15/+46
|\ \ \ | | | | | | | | Stream cookies only if needed
| * | | Dont stream back cookie value if it was set to the same valuebrainopia2012-04-302-4/+18
| | | |
| * | | Dont set cookie header for deletion of unexisting databrainopia2012-04-302-9/+26
| | | |
| * | | Simplify matching with array of possible domainsbrainopia2012-04-301-1/+1
| | | |
| * | | Use more appropriate one-liner for class declarationbrainopia2012-04-301-1/+1
| | | |
* | | | Merge pull request #6083 from brainopia/remove_unused_closed_ivarsJosé Valim2012-04-302-2/+0
|\ \ \ \ | |_|_|/ |/| | | Remove a couple of unused ivars left from previous refactoring
| * | | Remove unused ivars left from close checksbrainopia2012-04-302-2/+0
| | |/ | |/| | | | | | | These ivars were missed in d142572567 when close checks were removed
* | | Merge pull request #3726 from JanDupal/fix-date-helper-hiddenJosé Valim2012-04-302-0/+34
|\ \ \ | |_|/ |/| | fix Helpers::DateHelper with :use_hidden - hide separators
| * | fix Helpers::DateHelper with :use_hidden - hide separatorsJan Dupal2011-11-222-0/+34
| | |
* | | Merge pull request #6077 from ↵José Valim2012-04-304-64/+97
|\ \ \ | | | | | | | | | | | | | | | | dmitriy-kiriyenko/improve_signature_of_time_in_words_helper Replace boolean argument with an options hash.
| * | | Replace boolean argument with an options hash.Dmitriy Kiriyenko2012-04-304-64/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces `include_seconds` argument with an option key `include_seconds => true` in options hash. Also `time_ago_in_words` now passes options hash, including a `locale` key, which makes in compatible with `distance_of_time_in_words`.
* | | | Merge pull request #6078 from lest/patch-4José Valim2012-04-302-18/+23
|\ \ \ \ | | | | | | | | | | allow send_file/send_data to skip disposition header, closes #2973
| * | | | no need to dup options in send_dataSergey Nartimov2012-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | options aren't modified inside send_file_headers!
| * | | | allow send_file/send_data to skip disposition header, closes #2973Sergey Nartimov2012-04-302-17/+22
| |/ / /
* | | | Merge pull request #6034 from ↵Piotr Sarnacki2012-04-302-7/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | willbryant/flash_must_not_load_session_on_every_request_master Fix the Flash middleware loading the session on every request
| * | | | fix the Flash middleware loading the session on every request (very ↵Will Bryant2012-04-282-7/+3
| | | | | | | | | | | | | | | | | | | | dangerous especially with Rack::Cache), it should only be loaded when the flash method is called
* | | | | wrap translate defaults to use translate helper features, closes #1102Sergey Nartimov2012-04-303-1/+41
| |/ / / |/| | |
* | | | Add note about using 303 See Other for XHR requests other than GET/POSTAndrew White2012-04-301-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IE since version 6 and recently Chrome and Firefox have started following 302 redirects from XHR requests other than GET/POST using the original request method. This can lead to DELETE requests being redirected amongst other things. Although it doesn't directly affect the Rails framework since it doesn't return a 302 redirect to any non-GET/POST request a note has been added to raise awareness of the issue. Some references: Original article from @technoweenie: http://techno-weenie.net/2011/8/19/ie9-deletes-stuff/ Hacker News discussion of the article: http://news.ycombinator.com/item?id=2903493 WebKit bug report: https://bugs.webkit.org/show_bug.cgi?id=46183 Firefox bug report and changeset: https://bugzilla.mozilla.org/show_bug.cgi?id=598304 https://hg.mozilla.org/mozilla-central/rev/9525d7e2d20d Chrome bug report: http://code.google.com/p/chromium/issues/detail?id=56373 HTTPbis bug report and changeset: http://trac.tools.ietf.org/wg/httpbis/trac/ticket/160 http://trac.tools.ietf.org/wg/httpbis/trac/changeset/1428 Roy T. Fielding's history of the issue: http://ftp.ics.uci.edu/pub/ietf/http/hypermail/1997q3/0611.html Automated browser tests for the issue: http://www.mnot.net/javascript/xmlhttprequest/ Fixes #4144
* | | | Remove `button_to_function` and `link_to_function` helpersRafael Mendonça França2012-04-303-65/+2
| | | |
* | | | Add missing require when helpers are used in isolationRafael Mendonça França2012-04-301-0/+1
| | | |
* | | | Merge pull request #6074 from mark-rushakoff/unused-variablesJeremy Kemper2012-04-292-2/+1
|\ \ \ \ | | | | | | | | | | Remove some unused variable assignments
| * | | | Remove unused assignmentsMark Rushakoff2012-04-291-1/+0
| | | | |
| * | | | Remove unused assignment in actionpack date helper testMark Rushakoff2012-04-291-1/+1
| | | | |
* | | | | Restore interpolation of path option in redirect routesAndrew White2012-04-292-1/+42
| | | | |
* | | | | Escape interpolated params when redirecting - fixes #5688Andrew White2012-04-292-1/+36
| | | | |
* | | | | Add failing test case for #6053Andrew White2012-04-291-0/+21
| | | | |
* | | | | Fix controller_class_name for anonymous controllers.Michael Schuerig2012-04-291-1/+1
| | | | |
* | | | | Merge pull request #6059 from rafaelfranca/check_box_invertedJosé Valim2012-04-292-6/+100
|\ \ \ \ \ | | | | | | | | | | | | Change check_box to work inverting the checked and unchecked value
| * | | | | Change check_box to work inverting the checked and unchecked valueRafael Mendonça França2012-04-292-6/+100
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes: * Boolean with inverted logic * Integer with inverted logic * BigDecimal with inverted logic Fixes #3995
* | | | | Merge pull request #6006 from ↵José Valim2012-04-295-16/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | carlosantoniodasilva/partial-layout-collection-item Partial layout collection item
| * | | | | Add changelog entry and some docs for collection + layoutCarlos Antonio da Silva2012-04-292-3/+10
| | | | | |
| * | | | | Move layout logic with collection to be handled only with explicit template ↵Carlos Antonio da Silva2012-04-291-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is given Layout is never an available option when rendering with the shortcut `render @collection`.
| * | | | | Allow access to current object_counter variable from layout when rendering ↵Carlos Antonio da Silva2012-04-293-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | with partial + collection
| * | | | | Allow layout to access current object being rendered when using render ↵Carlos Antonio da Silva2012-04-292-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | partial + object
| * | | | | Allow layout rendering to access current object being rendered when using ↵Carlos Antonio da Silva2012-04-293-8/+18
| |/ / / / | | | | | | | | | | | | | | | partial + collection
* | | | | Merge pull request #6017 from larzconwell/remove_sanitize_dom_idJeremy Kemper2012-04-291-6/+1
|\ \ \ \ \ | |/ / / / |/| | | | Removed the sanitize_dom_id method
| * | | | Removed the sanitize_dom_id method because HTML5 doctype let's us use ↵Larz Conwell2012-04-271-6/+1
| | | | | | | | | | | | | | | | | | | | anything except nothing and whitespace for id's
* | | | | Add changelog entry for jsonp mimetype change, fix failing testCarlos Antonio da Silva2012-04-292-1/+3
| |_|_|/ |/| | | | | | | | | | | Fix failing test: Mime::JS generates "text/javascript"
* | | | Don't convert params if the request isn't HTML - fixes #5341Andrew White2012-04-292-8/+58
| | | |
* | | | Avoid calling content type multiple timesJosé Valim2012-04-291-4/+6
| | | |
* | | | Merge pull request #2321 from omjokine/masterJosé Valim2012-04-292-2/+5
|\ \ \ \ | | | | | | | | | | JSONP should use mimetype application/javascript
| * \ \ \ Merge remote-tracking branch 'upstream/master'Olli Jokinen2011-12-01180-6991/+9152
| |\ \ \ \
| * | | | | fixed test case test_render_json_with_callback to use content_type ↵Olli Jokinen2011-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | application/javascript
| * | | | | Change mimetype to Mime::JS if JSONP is usedOlli Jokinen2011-07-281-1/+4
| | | | | |