| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| | |
|
| |
| |
| |
| |
| | |
Conflicts:
actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
|
| |
| |
| |
| |
| | |
Conflicts:
activesupport/test/xml_mini/jdom_engine_test.rb
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix incorrectly appended square brackets to a multiple select box
Before:
select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
# => <select name="post[category][][]" ...>
After:
select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
# => <select name="post[category][]" ...>
Conflicts:
actionpack/CHANGELOG.md
actionpack/lib/action_view/helpers/tags/base.rb
actionpack/test/template/form_options_helper_test.rb
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 724020278480855bddfe749c91f1074d4f50f3c6, reversing
changes made to e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/relation/calculations.rb
activerecord/test/cases/calculations_test.rb
|
| |
| |
| |
| |
| | |
Conflicts:
activerecord/lib/active_record/result.rb
|
| | |
|
| | |
|
|\ \
| | |
| | | |
Do not freeze NumberHelper defaults
|
|/ /
| |
| |
| | |
Closes #9767.
|
| |
| |
| |
| | |
Closes #9730.
|
|\ \
| | |
| | | |
i18n locale fallback for localized views
|
|/ / |
|
| |
| |
| |
| |
| | |
The `skip` method is a no-op on Ruby 1.8.7 so we still need to
force skip by returning early from each test.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The previous implementation `ActiveSupport::TimeZone.parse` used `Time.parse`
which applies the system time DST rules to the parsed time. Instead we now
use `Time.utc` and manually apply the offset.
Backport tests from:
005d910624bbfa724b638426a000c8074d4201a2
c89b6c4cdce7ee55ed3665c099d914222fe0344a
03becb13099c439f6aea5058546bc8b0b19b8db8
Fixes #9678.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix incorrectly appended square brackets to a multiple select box
Before:
select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
# => <select name="post[category][][]" ...>
After:
select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
# => <select name="post[category][]" ...>
Conflicts:
actionpack/CHANGELOG.md
actionpack/lib/action_view/helpers/tags/base.rb
actionpack/test/template/form_options_helper_test.rb
|
|\ \
| | |
| | | |
Removing FIXME
|
| | |
| | |
| | | |
As we did in master.
|
|\ \ \
| | | |
| | | | |
Using latest AR-JDBC for JRuby
|
| |/ /
| | |
| | |
| | | |
1.2.5 and 1.2.6 are bad ones
|
|\ \ \
| | | |
| | | | |
@target might be nil when Identity Map is enabled.
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
* With Identity Map enabled, NameError might be raised and @target is
nil. So we should always ensure `@target ||= find_target`.
* Only force reload target when it is stale.
|
|\ \ \
| | | |
| | | | |
Fix issue #7526. Reload the association target if it's stale.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* This has been fixed at master via `365b8b6`, but not at 3-2-stable branch.
* @stale_state should be nil when a model isn't saved. via `0f3901e`.
* set @stale_state to nil when reset the target.
|
|\ \ \ \
| | | | |
| | | | | |
Use shorter prefix and suffix to support Oracle adapter
|
|/ / / /
| | | |
| | | |
| | | | |
cannot be larger than 30 characters
|
| | | | |
|
|\ \ \ \
| |/ / /
|/| | | |
Backported #7774 to 3-2-stable
|
|/ / /
| | |
| | |
| | |
| | | |
Fix ActionDispatch::Request#formats when HTTP_ACCEPT header is an empty
string.
|
|\ \ \
| | | |
| | | | |
Fix typo on ActionPack's ChangeLog
|
| | | | |
|
|\ \ \ \
| |/ / /
|/| | | |
Fix unused variable warning in mapper.rb
|
|/ / /
| | |
| | | |
Was forgotten in a72dab0.
|
| | |
| | |
| | |
| | |
| | | |
Conflicts:
activerecord/lib/active_record/result.rb
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
[ci skip]
Conflicts:
activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
Backported #6755 to 3-2-stable. Don't read csv file during executing db:fixtures:load.
CSV fixtures have already been removed some time ago in 1716da07204193c8acf967e2d75a53a82e4c7c28, but the task was still loading them, even though later it tried to find the related yaml file.
|
|/ / /
| | |
| | |
| | | |
db:fixtures:load.
|
| | |
| | |
| | |
| | |
| | | |
v0.6.2 and v0.6.3 both have issues with Ruby 1.8.7, see
https://github.com/svenfuchs/i18n/issues/192 for more info.
|
|\ \ \
| | | |
| | | | |
Revert "Skip test_remove_column_with_array_as_an_argument_is_deprecated ...
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Oracle adapter."
This reverts commit 7544c7a9f290a3ea25099ae38d52795458391785.
Oracle enhanced adapter is supporting remove_column with Array.
|
|\ \ \
| |_|/
|/| | |
Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix
|
|/ /
| |
| |
| | |
backport pull request#5837 to 3-2-stable
|