aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Use to_model delegates for polymorphic route generationNathaniel Bibler2012-06-012-2/+34
|
* bumping to 3.2.5Aaron Patterson2012-05-311-1/+1
|
* bumping to 3.2.4Aaron Patterson2012-05-311-1/+1
|
* adding security notifications to CHANGELOGsAaron Patterson2012-05-311-0/+3
|
* Merge branch '3-2-stable-sec' into 3-2-relAaron Patterson2012-05-312-1/+28
|\ | | | | | | | | | | * 3-2-stable-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
| * Strip [nil] from parameters hash.Aaron Patterson2012-05-302-1/+28
| | | | | | | | | | | | Thanks to Ben Murphy for reporting this! CVE-2012-2660
* | updating changelogsAaron Patterson2012-05-311-1/+11
|/
* bumping to 3.2.4.rc1Aaron Patterson2012-05-281-2/+2
|
* remove unnecessary memcache equire in ActionDispatch::Session::CacheStoreBrian Durand2012-05-261-1/+0
|
* Assets: don't add extension if other given and file existsSergey Nartimov2012-05-213-2/+10
| | | | | | | | | | | | | | We should lookup if asset without appended extension exists. When sprockets are disabled the asset tag helpers incorporate this logic. When sprockets are enabled we should have the same logic. For example, we have style.ext file in app/assets/stylesheets and we use stylesheet_link_tag in the layout. In this case we should have /assets/style.ext instead of /assets/style.ext.css in the output. Closes #6310
* Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stableRafael Mendonça França2012-05-202-3/+3
|\ | | | | TagHelper creates invalid data attributes when value is a BigDecimal
| * Fixed tag_helper data-attribute bug with BigDecimalsBodacious2012-05-202-3/+3
| |
* | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614cJosé Valim2012-05-201-10/+22
|\ \ | |/ |/| Template concurrency fixes
| * Prevent concurrent compilation of templates - closes #6400Tom Clarke2012-05-201-10/+22
| |
* | Use right option for excerpt text helper in tests, fix buildCarlos Antonio da Silva2012-05-192-10/+10
| | | | | | | | | | | | | | `excerpt` text helper uses `:radius`, not `line_width` (that is used by `word_wrap` helper). Also cleanup some whitespaces.
* | Merge pull request #5020 from KL-7/fix-blank-image_tag-sourceJosé Valim2012-05-182-2/+3
| | | | | | | | Render img tag with empty src if empty string is passed to image_tag.
* | Deprecate old APIs for highlight, excerpt and word_wrapJeremy Walker2012-05-183-36/+56
| |
* | Deprecate `:disable_with` for `button_tag` tooCarlos Galdino + Rafael Mendonça França2012-05-145-9/+20
| |
* | Fix typoCarlos Galdino + Rafael Mendonça França2012-05-143-10/+10
| |
* | Deprecate `:disable_with` in favor of `'data-disable-with'` option for ↵Carlos Galdino + Rafael Mendonça França2012-05-145-31/+54
| | | | | | | | `button_to` and `submit_tag` helpers.
* | Deprecate `:mouseover` options for `image_tag` helper.Rafael Mendonça França2012-05-133-8/+44
| |
* | Merge pull request #3237 from sakuro/data-url-schemeRafael Mendonça França2012-05-133-3/+4
| | | | | | | | Support data: url scheme
* | Upgrade sprockets to 2.1.3Guillermo Iguaran2012-05-131-1/+1
| |
* | Don't ignore nil positional arguments for url helpers - fixes #6196.Andrew White2012-05-102-1/+35
| |
* | Refactor the handling of default_url_options in integration testsAndrew White2012-05-102-7/+104
| | | | | | | | | | | | | | | | | | | | | | | | This commit improves the handling of default_url_options in integration tests by making behave closer to how a real application operates. Specifically the following issues have been addressed: * Options specified in routes.rb are used (fixes #546) * Options specified in controllers are used * Request parameters are recalled correctly * Tests can override default_url_options directly
* | Merge pull request #6149 from jmbejar/javascript_include_tag_with_not_duplicatesSantiago Pastorino2012-05-092-2/+8
|\ \ | | | | | | Make sure that javascript_include_tag/stylesheet_link_tag methods don't consider duplicated assets
| * | Make sure that javascript_include_tag/stylesheet_link_tag methods inJorge Bejar2012-05-032-2/+8
| | | | | | | | | | | | sprockets/helpers/rails_helper.rb discard duplicated assets
* | | If content_type is explicitly passed to the :head method use the value or ↵Kunal Shah2012-05-071-1/+2
| | | | | | | | | | | | fallback
* | | Add failing test re #3436 which demonstrates content_type is not respected ↵Kunal Shah2012-05-071-0/+21
| | | | | | | | | | | | when using the :head method/shortcut
* | | Add a role option to wrap_parameters.Nick Ragaz2012-05-042-4/+18
|/ / | | | | | | The role option identifies which parameters are accessible and should be wrapped. The default role is :default.
* | Reset the request parameters after a constraints checkAndrew White2012-05-033-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A callable object passed as a constraint for a route may access the request parameters as part of its check. This causes the combined parameters hash to be cached in the environment hash. If the constraint fails then any subsequent access of the request parameters will be against that stale hash. To fix this we delete the cache after every call to `matches?`. This may have a negative performance impact if the contraint wraps a large number of routes as the parameters hash is built by merging GET, POST and path parameters. Fixes #2510. (cherry picked from commit 56030506563352944fed12a6bb4793bb2462094b)
* | Fix #3993 assets:precompile task does not detect index filesDmitry Vorotilin2012-05-011-0/+3
| |
* | fix the Flash middleware loading the session on every request (very ↵Will Bryant2012-04-302-7/+3
| | | | | | | | dangerous especially with Rack::Cache), it should only be loaded when the flash method is called
* | 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 (cherry picked from commit 24f143789a8989f3bccde14ff28067de25cafd87)
* | Add CHANGELOG entry.Rafael Mendonça França2012-04-301-1/+6
| | | | | | | | | | Closes #5886 Closes #3093
* | Deprecate link_to_function and button_to_function helpersRafael Mendonça França2012-04-302-12/+28
| |
* | Add missing require when helpers are used in isolationRafael Mendonça França2012-04-301-0/+1
| |
* | Restore interpolation of path option in redirect routesAndrew White2012-04-292-1/+50
| |
* | Add missing require from b608cdd64c95d0d16eb98d86562e22f3b01be9e3Andrew White2012-04-291-0/+1
| |
* | Escape interpolated params when redirecting - fixes #5688Andrew White2012-04-292-1/+34
| |
* | Remove warning of unused variableRafael Mendonça França2012-04-291-1/+1
| |
* | Fix the build.Rafael Mendonça França2012-04-291-2/+2
| | | | | | | | | | * The method for persisted records in 3-2-branch is 'PUT' * size is generated by default in inputs
* | Don't convert params if the request isn't HTML - fixes #5341Andrew White2012-04-292-8/+58
| | | | | | | | | | | | | | | | (cherry picked from commit 7a80b69e00f68e673c6ceb5cc684aa9196ed3d9f) Conflicts: actionpack/test/controller/test_test.rb
* | Lazy load `default_form_builder` if it's passed as a stringPiotr Sarnacki2012-04-283-1/+26
| | | | | | | | closes #3341
* | Do not mutate options hashCarlos Antonio da Silva2012-04-272-2/+8
| |
* | fix number_to_human docs [ci skip]Vijay Dev2012-04-261-2/+2
| |
* | Fix broken test from the earlier merge conflictPrem Sichanugrist2012-04-231-9/+11
| | | | | | | | Seriously people, please run the test before submitting pull request.
* | Merge pull request #5866 from tiegz/minor_fixes_3-2-stableAaron Patterson2012-04-232-42/+27
|\ \ | | | | | | Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
| * | converting some tests to assert_raises, and DRY'ing retrieve_variable changesTieg Zaharia2012-04-162-47/+23
| | | | | | | | | | | | | | | | | | Conflicts: actionpack/test/template/render_test.rb
| * | catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-162-1/+10
| | |