aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8161 from guilleiguaran/downgrade-sprocketsRafael Mendonça França2012-11-091-1/+1
|\ | | | | | | | | | | | | | | | | Lock sprockets to 2.2.x REASON: We had some pending fixes in sprockets and sass-rails to make possible to use sprockets version > 2.2. We will do a more conservative sprockets upgrade for this release. In a next release we can relax the dependency again. See #8099 for more information.
| * Lock sprockets to 2.2.xGuillermo Iguaran2012-11-091-1/+1
| |
* | Fix redirect example blockCarlos Antonio da Silva2012-11-091-3/+3
| | | | | | | | See #8160. [ci skip]
* | Merge pull request #8093 from nikitug/keep_app_x_ua_compatibleCarlos Antonio da Silva2012-11-083-1/+46
| | | | | | | | | | | | | | Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header) Conflicts: actionpack/CHANGELOG.md
* | backport, handle trailing slash with enginesYves Senn2012-11-083-1/+11
| | | | | | | | this is a backport of #8115 to fix #7842
* | Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-instance-tagRafael Mendonça França2012-11-083-1/+34
|/ | | | | | | Support :multiple option on input tags that also have :index Conflicts: actionpack/lib/action_view/helpers/tags/base.rb actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
* Clear url helpers when reloading routesSantiago Pastorino2012-11-022-0/+5
|
* Add test to avoid regression of 4a86362Rafael Mendonça França2012-11-021-0/+10
|
* Revert "Merge pull request #7668 from Draiken/fix_issue_6497"Rafael Mendonça França2012-11-023-18/+7
| | | | | | | | | This reverts commit 61d5d2d8a97fd289b81991cd79dca3112e7ca135. Conflicts: actionpack/CHANGELOG.md REASON: This added a backward incompatible change.
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-011-1/+1
|
* Revert "Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased"Rafael Mendonça França2012-10-314-37/+14
| | | | | | | | | | | | | This reverts commit 7d17cd2cbfc086f5aa9dd636e1207eb130150428. Conflicts: actionpack/CHANGELOG.md Reason: This added a regression since people were relying on this buggy behavior. This will introduce back #3849 but we will be backward compatible in stable release. Fixes #8068.
* Revert "Merge pull request #7797 from ↵Rafael Mendonça França2012-10-303-23/+31
| | | | | | | | | | | | | | | | | senny/7459_prefix_tempalte_assertion_variables" This reverts commit 2bad605873b5b720d77ae6388a995827ab7fe705. Conflicts: actionpack/CHANGELOG.md Reason: This added a regression related with shoulda-matchers, since it is expecting the instance variable @layouts See https://github.com/thoughtbot/shoulda-matchers/blob/9e1188eea68c47d9a56ce6280e45027da6187ab1/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb#L74 This will introduce back #7459 but this stable release will be backward compatible. Related with #8068.
* Bump to 3.2.9.rc1Santiago Pastorino2012-10-291-2/+2
|
* Merge pull request #7865 from teleological/link_to_remote_3_2Rafael Mendonça França2012-10-063-1/+12
|\ | | | | Accept :remote as symbol in link_to options (backport)
| * Accept :remote as symbol in link_to optionsRiley2012-10-063-1/+12
| | | | | | | | | | Accept either :remote or 'remote' in both the html_options and (url_)options hash arguments to link_to.
* | Use the Ruby 1.8 hash syntaxRafael Mendonça França2012-10-061-1/+1
|/
* Merge pull request #7848 from senny/3415_assert_template_has_nil_variableRafael Mendonça França2012-10-063-3/+23
| | | | | | can't pass :locals to #assert_template without a view test case (#3415) Conflicts: actionpack/CHANGELOG.md
* Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variablesRafael Mendonça França2012-10-013-23/+29
| | | | | | | | | prefix TemplateAssertions ivars. Closes #7459 Conflicts: actionpack/lib/action_controller/test_case.rb actionpack/lib/action_view/test_case.rb
* Merge pull request #7789 from senny/7777_resource_functions_modify_optionsRafael Mendonça França2012-10-013-2/+27
| | | | resource and resources do no longer modify passed options
* Since File instance doesn't respond to #open use a double to test theRafael Mendonça França2012-09-303-5/+4
| | | | behavior added at c53e5def08f7a289a92a8e5f79dcd7caa5c3a2fb
* Asset manifest includes aliases for foo.js -> foo/index.js and vice versa. ↵Jeremy Kemper2012-09-303-21/+27
| | | | Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
* New CHANGELOG entries always in the top [ci skip]Rafael Mendonça França2012-09-301-6/+6
|
* Merge pull request #7659 from HugoLnx/template_error_no_matches_rebasedRafael Mendonça França2012-09-304-6/+55
| | | | | | | REBASED: fixing assert_template bug when template matches expected, but not ends with Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_controller/test_case.rb
* Don't paramify ActionDispatch::Http::UploadedFile in testsTim Vandecasteele2012-09-293-1/+14
| | | | | | | | | | To test uploading a file without using fixture_file_upload, a posted ActionDispatch::Http::UploadedFile should not be paramified (just like Rack::Test::UploadedFile). (Rack::Test::UploadedFile and ActionDispatch::Http::UploadedFile don't share the same API, tempfile is not accessible on Rack::Test::UploadedFile as discussed in https://github.com/brynary/rack-test/issues/30)
* Shush uninitialized @_layout warningJeremy Kemper2012-09-281-1/+1
|
* Revert "Revert "Respect `config.digest = false` for `asset_path`""Rafael Mendonça França2012-09-203-1/+20
| | | | | | This reverts commit 54f55746a70a7091341e84236498203118a7fbb4. Reason: the last commit fixed the failing case
* Revert "Respect `config.digest = false` for `asset_path`"Rafael Mendonça França2012-09-203-20/+1
| | | | | | | | | | | | This reverts commit 1ac19c11792a745cd654f02dfaed8e93f95b3c70. Conflicts: actionpack/CHANGELOG.md Reason: This is causing failures in the railties build. See http://travis-ci.org/#!/rails/rails/jobs/2491787 Related with #7672
* Merge pull request #7668 from Draiken/fix_issue_6497Rafael Mendonça França2012-09-193-1/+18
| | | | | | Removing to_shorthand to fix #6497 Conflicts: actionpack/CHANGELOG.md
* Respect `config.digest = false` for `asset_path`Peter Wagenet2012-09-173-1/+20
| | | | | | | Previously, the `asset_path` internals only respected the `:digest` option, but ignored the global config setting. This meant that `config.digest = false` could not be used in conjunction with `config.compile = false` this corrects the behavior.
* log 404 status when ActiveRecord::RecordNotFound was raised (#7646)Yves Senn2012-09-174-3/+27
| | | | | | Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_controller/log_subscriber.rb
* Fix bug when Rails.application is defined but is nil. See #881Marc-Andre Lafortune2012-08-282-1/+8
|
* CHANGELOGs are now per branchXavier Noria2012-08-281-5654/+1
| | | | Check 810a50d for the rationale.
* correct handling of date selects when using both disabled and discard optionsVasiliy Ermolovich2012-08-253-2/+34
| | | | | | | | | | | | we should take disabled option not only from `html_options` hash but from `options` hash too like `build_select` method does it. So datetime_select("post", "updated_at", { :discard_minute => true }, { :disabled => true }) datetime_select("post", "updated_at", :discard_minute => true , :disabled => true) both these variants work now closes #7431
* Merge pull request #7410 from sandeepravi/default_options_helper_valueRafael Mendonça França2012-08-213-0/+18
| | | | | | option_tags coerced to "" instead of nil Closes #7404
* Backport 5c51cd0: #send_file leans on Rack::Sendfile to X-Accel-Redirect the ↵Jeremy Kemper2012-08-152-2/+28
| | | | file's path, so opening the file to set the response body is wasteful. Set a FileBody wrapper instead that responds to to_path and streams the file if needed.
* Update changelog to reflect support of cookie jar options for allbrainopia2012-08-111-0/+5
| | | | session stores
* Test actual content of permanent cookiebrainopia2012-08-101-1/+1
|
* Dont stream back cookie value if it was set to the same valuebrainopia2012-08-102-5/+19
|
* Revert "Revert "Merge pull request #6084 from ↵brainopia2012-08-102-0/+14
| | | | | | brainopia/support_for_magic_domain_on_all_stores"" This reverts commit a48ea6800ef712440b08c551f8041feb35de8cb4.
* Merge branch '3-2-8' into 3-2-stableSantiago Pastorino2012-08-096-7/+27
|\
| * Bump to 3.2.8Santiago Pastorino2012-08-091-1/+1
| |
| * Add release date to CHANGELOGsSantiago Pastorino2012-08-091-1/+1
| |
| * Do not mark strip_tags result as html_safeSantiago Pastorino2012-08-093-3/+10
| | | | | | | | | | | | Thanks to Marek Labos & Nethemba CVE-2012-3465
| * escape select_tag :prompt valuesSantiago Pastorino2012-08-093-2/+15
| | | | | | | | CVE-2012-3463
| * Bump to 3.2.8.rc2Santiago Pastorino2012-08-031-1/+1
| |
| * html_escape should escape single quotesSantiago Pastorino2012-08-029-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content Closes #7215 Conflicts: actionpack/test/template/erb_util_test.rb actionpack/test/template/form_tag_helper_test.rb actionpack/test/template/text_helper_test.rb actionpack/test/template/url_helper_test.rb activesupport/lib/active_support/core_ext/string/output_safety.rb
* | Fix CHANGELOG [ci skip]Rafael Mendonça França2012-08-081-1/+4
| |
* | Remove references to old behavior with headers atRafael Mendonça França2012-08-071-4/+3
| | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Integration::ResquestHelpers. The behavior has removed at 4a6f4b92ad2f48dc7906d223fe4708d36624bd50 to increase the compatibility with Rack::Test Closes #7136 [ci skip]
* | Loosen sprockets version restrictionJoshua Peek2012-08-071-1/+1
| |
* | Rearrange example output of javascript_include_tagPrem Sichanugrist2012-08-061-2/+2
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:29:46 +0000