aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6649 from route/logger_in_metal_3_2Carlos Antonio da Silva2012-06-182-2/+21
|\ | | | | Logger in metal backport for 3.2
| * Added test for case when view doesn't have logger method when using ↵Dmitry Vorotilin2012-06-161-0/+17
| | | | | | | | ActionController::Metal controller.
| * ActionController::Metal doesn't have logger method, check it and then delegateDmitry Vorotilin2012-06-161-2/+4
| |
* | It should also include text/css => Build FixArun Agrawal2012-06-161-1/+1
| |
* | Merge pull request #6752 from steveklabnik/fix_5680Rafael Mendonça França2012-06-163-4/+21
|/ | | | Respect absolute paths in compute_source_path.
* adding a test for #6459Aaron Patterson2012-06-141-0/+10
|
* ActionController::Caching depends on RackDelegation and ↵Santiago Pastorino2012-06-132-0/+35
| | | | AbstractController::Callbacks
* updating changelogsAaron Patterson2012-06-121-1/+3
|
* bumping version numbersAaron Patterson2012-06-111-1/+1
|
* updating changelogs with security fixesAaron Patterson2012-06-111-0/+2
|
* Array parameters should not contain nil values.Aaron Patterson2012-06-112-2/+8
|
* Duplicate tests removed.Arun Agrawal2012-06-091-16/+0
|
* Fix railties test suitePiotr Sarnacki2012-06-081-2/+1
| | | | | | Apparently asset_environment should not be invoked if it's not needed. This fixes broken build by getting back to the code more similar to the version changed here: 5b0a891
* Fix asset tags for files with more than one dotPiotr Sarnacki2012-06-074-1/+9
| | | | | | | | | | | | | | | After the fix done in 39f9f02a, there are cases that will not work correctly. If you have file with "2 extensions", like foo.min.js and you reference the file without extension, like: javascript_include_tag "foo.min" it will fail because sprockets finds foo.min.js with foo.min argument. This commit fixes this case and will get the right file even when referrencing it without extension. (closes #6598)
* Revert "fix the Flash middleware loading the session on every request (very ↵Rafael Mendonça França2012-06-052-3/+7
| | | | | | | | | dangerous especially with Rack::Cache), it should only be loaded when the flash method is called" This reverts commits e3069c64b2c5ddc7a5789b55b8efd4902d9e9729 and 2b2983d76fd11efc219273036a612f47cfaa5bfa. Reason: This add a non-backward compatible change in the way that flash works now (swept in every request).
* Add test to flash sweep after two redirectsRafael Mendonça França2012-06-051-0/+20
| | | | | This test is needed to avoid regressions in the way that flash works now (swept in every request).
* Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` optionCarlos Galdino2012-06-055-21/+127
| | | | | | | | | | | | This deprecation applies to: `button_to` `button_tag` `image_submit_tag` `link_to` `submit_tag` As :confirm is an UI specific option is better to use the data attributes, teaching users about unobtrusive JavaScript and how Rails works with it.
* Allow to use mounted helpers in ActionView::TestCasePiotr Sarnacki2012-06-014-1/+24
| | | | | Similarly to 6525002, this allows to use routes helpers for mounted helpers, but this time in ActionView::TestCase
* Merge pull request #6588 from nbibler/polymorphic_to_modelJosé Valim2012-06-012-2/+34
|\ | | | | Correct the use of to_model in polymorphic routing
| * Use to_model delegates for polymorphic route generationNathaniel Bibler2012-06-012-2/+34
| |
* | Add release date of 3.2.5 on the CHANGELOGRafael Mendonça França2012-06-011-0/+7
| |
* | Include routes.mounted_helpers into integration testsPiotr Sarnacki2012-06-013-2/+28
|/ | | | | | | | | | | | | | | In integration tests, you might want to use helpers from engines that you mounted in your application. It's not hard to add it by yourself, but it's unneeded boilerplate. mounted_helpers are now included by default. That means that given engine mounted like: mount Foo::Engine => "/foo", :as => "foo" you will be able to use paths from this engine in tests this way: foo.root_path #=> "/foo" (closes #6573)
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 02:52:19 +0000