aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* Only use valid mime type symbols as cache keysAaron Patterson2013-11-301-0/+7
| | | | CVE-2013-6414
* updating changelogsAaron Patterson2013-10-161-1/+1
|
* bumping to 3.2.15Aaron Patterson2013-10-151-1/+1
|
* Merge branch '3-2-15' into 3-2-secAaron Patterson2013-10-151-2/+2
|\ | | | | | | | | | | | | | | | | | | | | * 3-2-15: bumping to rc3 Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build" Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target" bumping to rc2 Merge pull request #12443 from arthurnn/add_inverse_of_add_target bumping version to 3.2.15.rc1 Fix STI scopes using benolee's suggestion. Fixes #11939
| * bumping to rc3Aaron Patterson2013-10-111-1/+1
| |
| * bumping to rc2Aaron Patterson2013-10-041-1/+1
| |
| * bumping version to 3.2.15.rc1Aaron Patterson2013-10-031-2/+2
| |
* | Merge branch '3-2-stable' into 3-2-secAaron Patterson2013-10-032-1/+9
|\| | | | | | | | | | | * 3-2-stable: make sure both headers are set before checking for ip spoofing Move set_inverse_instance to association.build_record
| * make sure both headers are set before checking for ip spoofingTamir Duberstein2013-10-012-1/+9
| |
* | Remove the use of String#% when formatting durations in log messagesMichael Koziarski2013-09-301-6/+5
|/ | | | | This avoids potential format string vulnerabilities where user-provided data is interpolated into the log message before String#% is called.
* Fix FinderMethods#last unscoped primary keyEugene Kalenkovich2013-09-121-1/+0
| | | | | | | | Fixes table.joins(:relation).last(N) breaking on sqlite Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/finder_test.rb
* pass the extra params to the rack test environment so that routes with block ↵Brian Hahn2013-09-064-4/+25
| | | | constraints have access
* fix issue #11605Kassio Borges2013-08-2412-31/+16
|
* Fix actionpack CHANGELOG entryRafael Mendonça França2013-07-221-1/+4
| | | | It was included by git on the wrong release
* Merge branch '3-2-14' into 3-2-stableRafael Mendonça França2013-07-222-2/+2
|\
| * Preparing for 3.2.14 releaseRafael Mendonça França2013-07-221-1/+1
| |
| * Update CHANGELOG entryRafael Mendonça França2013-07-221-6/+1
| |
| * Preparing for 3.2.14.rc2 releaseRafael Mendonça França2013-07-162-2/+7
| |
| * Preparing for 3.2.14.rc1 releaseRafael Mendonça França2013-07-122-3/+3
| |
* | Fix `assert_redirected_to` does not show user-supplied message.Alexey Chernenkov2013-07-183-2/+11
| | | | | | | | | | | | Issue: when `assert_redirected_to` fails due to the response redirect not matching the expected redirect the user-supplied message (second parameter) is not shown. This message is only shown if the response is not a redirect.
* | Removed unused test fileArun Agrawal2013-07-171-32/+0
|/ | | | This test file is not be running from a long time This test is already covered in controller/caching_test.rb
* Add license to the gemspecRafael Mendonça França2013-07-081-0/+3
|
* Add missing requireSantiago Pastorino2013-07-021-0/+1
|
* Use old style hash syntax for 3-2-stableAndrew White2013-06-251-2/+2
|
* Fix shorthand routes where controller and action are in the scopeAndrew White2013-06-253-0/+30
| | | | | | | | | | | Merge `:action` from routing scope and assign endpoint if both `:controller` and `:action` are present. The endpoint assignment only occurs if there is no `:to` present in the options hash so should only affect routes using the shorthand syntax (i.e. endpoint is inferred from the the path). Fixes #9856 Backport of 37b4276
* Add CHANGELOG entry for #10971Rafael Mendonça França2013-06-241-0/+14
| | | | [ci skip]
* Merge pull request #10971 from dtaniwaki/escape_link_to_unlessRafael Mendonça França2013-06-242-1/+6
| | | | Always escape the result of link_to_unless method
* Compare host scheme using case-insensitive regexpRafael Mendonça França2013-06-163-11/+52
| | | | | | | | | | | | | | | | | | Before: image_tag("HTTP://google.com") # => "<img alt=\"Google\" src=\"/assets/HTTP://google.com\" />" image_tag("http://google.com") # => "<img alt=\"Google\" src=\"http://google.com\" />" After: image_tag("HTTP://google.com") # => "<img alt=\"Google\" src=\"HTTP://google.com\" />" image_tag("http://google.com") # => "<img alt=\"Google\" src=\"http://google.com\" />" Backport of #10969
* So not make Fixnum#/ private on Ruby verions less than 1.9.3Rafael Mendonça França2013-05-101-4/+3
| | | | In those version to_date call Fixnum#/, what will cause a failure
* Merge pull request #10478 from cainlevy/patch-1Rafael Mendonça França2013-05-061-1/+1
| | | | | | use canonical #controller_path logic in controller test cases Conflicts: actionpack/lib/action_controller/test_case.rb
* Merging in fix from #8222Ben Tucker2013-05-062-1/+6
|
* just clear the caches on clear! rather than replacing. fixes #10251Aaron Patterson2013-04-171-8/+4
|
* Improve the changelog entry [ci skip]Rafael Mendonça França2013-04-051-3/+4
|
* Fix explicit names on multiple file fieldsRyan McGeary2013-04-053-8/+24
| | | | | | | | If a file field tag is passed the multiple option, it is turned into an array field (appending "[]"), but if the file field is passed an explicit name as an option, leave the name alone (do not append "[]"). Fixes #9830
* Fix typo in view nameCarlos Antonio da Silva2013-04-032-1/+1
| | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
* Use 1.8 hash style in test viewsCarlos Antonio da Silva2013-04-032-2/+2
| | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
* Common behavior with adding formats to lookup_context for TemplateRenderer ↵Dmitry Vorotilin2013-04-0212-4/+33
| | | | and PartialRenderer
* Fix formatting and minor review in AP changelogCarlos Antonio da Silva2013-03-301-9/+8
| | | | Sentences starting with # are considered headings.
* Fixed test failures on 1.8.7 caused by 74e59eaFred Wu2013-03-271-1/+1
|
* Backport #5808Mack Earnhardt2013-03-243-6/+60
| | | | | | df36c5f - Fix assert_template assertion with :layout option 4bd05a7 - Fix assert_template :layout => nil assertion 0d19a08 - Improve assert_template layout checking
* Fix test to Ruby 1.8Rafael Mendonça França2013-03-211-1/+1
| | | | Pathname doesn't respond to to_path
* Improve CHANGELOG entry [ci skip]Rafael Mendonça França2013-03-211-1/+5
|
* Merge branch '3-2-stable' into fredwu-slow_view_loading_fixAaron Patterson2013-03-203-1/+18
|\ | | | | | | | | | | | | | | | | | | | | * 3-2-stable: Merge pull request #9802 from newsline/fix-broken-action-missing Remove bad changelog entry from AR [ci skip] Wrong exception is occured when raising no translatable exception Don't crash exception translation w/ nil result attribute. Conflicts: actionpack/CHANGELOG.md
| * Merge pull request #9802 from newsline/fix-broken-action-missingRafael Mendonça França2013-03-203-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | Fix missing action_missing Conflicts: actionpack/CHANGELOG.md Conflicts: actionpack/test/controller/base_test.rb Fixes #9799
* | Added changelog for 687e68dFred Wu2013-03-211-0/+6
| |
* | Fixed assets loading performance in 3.2.13Fred Wu2013-03-202-1/+10
|/ | | | | The PR #8756 uses Sprockets for resolving files that already exists on disk, for those files their extensions don't need to be rewritten. Fixes #9803
* Backport #9347 to rails 3.2hoffm2013-03-193-1/+20
|
* Add release dates to documentation [ci skip]claudiob2013-03-181-1/+1
| | | | Set "March 18, 2013" as the release date for 3.2.13
* Fix changelog conflicts and remove release dates [ci skip]Carlos Antonio da Silva2013-03-181-11/+5
|
* Merge branch '3-2-13' into 3-2-stableAaron Patterson2013-03-184-6/+28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-13: bumping to 3.2.13 fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854] Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets bumping to rc2 Revert "Merge pull request #8209 from senny/backport_8176" Freeze columns only once per Result Preparing for 3.2.13.rc1 release Update CHANGELOGs for 3.2.13 release. Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md activemodel/CHANGELOG.md activeresource/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md