New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
3 2 stable #5850
3 2 stable #5850
Commits on Feb 10, 2012
-
Fix that failed tests should exit with a nonzero error code.
Partially reverts 14c89e7. Hat tip to @tenderlove for paring down the TestTask!
Commits on Feb 13, 2012
-
Fix deprecation warning in AS::Concern.
José Valim committedFeb 13, 2012
Commits on Feb 14, 2012
-
Merge pull request rails#5038 from carlosantoniodasilva/fix-db-migrat…
…e-redo Always reenable _dump task in AR databases rake. Closes rails#5030
-
Rack body respond to each and not to join
This fixes undef `to_str' for Rack::Chunked::Body when using caches_action + streaming on an action Closes rails#5027
Commits on Feb 15, 2012
-
-
Merge pull request rails#5049 from fabioyamate/master
Fix sanitize_for_mass_assigment when role is nil
Commits on Feb 17, 2012
-
backporting rails#4918 to 3.2 stable; adding extra test for accept he…
…ader given by googlebot
Aditya Sanghi committedFeb 17, 2012 -
Merge pull request rails#5073 from asanghi/4918_backport
Backporting rails#4918 with one added test for googlebot accept header as I saw it
José Valim committedFeb 17, 2012 -
Merge pull request rails#5071 from arunagw/fix_failing_test_ruby187_p358
Fix failing test ruby187 p358
-
Fix ActionDispatch::Static to serve files with unencoded PCHAR
RFC 3986[1] allows sub-delim characters in path segments unencoded, however Rack::File requires them to be encoded so we use URI's unescape method to leave them alone and then escape them again. Also since the path gets passed to Dir[] we need to escape any glob characters in the path. [1]: http://www.ietf.org/rfc/rfc3986.txt
-
Commits on Feb 18, 2012
Commits on Feb 19, 2012
Commits on Feb 20, 2012
-
Remove fixture files with Windows incompatible filenames
Windows doesn't allow `\ / : * ? " < > |` in filenames so create the fixture files at runtime and ignore the incompatible ones when running on Windows.
-
sync __run_callbacks with ruby-trunk
https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580 In this revision behavior of respond_to? had changed: now to ask about protected method one should pass second argument `true`
-
-
-
Merge pull request rails#5101 from ckdake/ckdake_actionview_handler_r…
…eset Reset memoized hash keys when new ActionView::Template handler is registered
-
-
Commits on Feb 21, 2012
-
-
-
-
Merge pull request rails#5106 from kennyj/fix_warnings_20120210
[3-2-stable] Fix some warnings
-
-
Merge pull request rails#5096 from lawso017/master
Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
-
-
-
ruby 2.0 makes protected methods return false for respond_to, so pass…
… true as the second param
-
-
Commits on Feb 22, 2012
-
-
-
format lookup for partials is derived from the format in which the te…
…mplate is being rendered Closes rails#5025 part 2
-
-
-
-
Merge pull request rails#5084 from johndouthat/patch-1
Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
-
Merge pull request rails#5084 from johndouthat/patch-1
Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
-
Merge pull request rails#5087 from pwnall/no_view_logger
Remove reference to config.action_view.logger from Rails configuration guide
Commits on Feb 23, 2012
-
-
Merge pull request rails#4834 from sskirby/fix_usage_of_psql_in_db_te…
…st_prepare Fix usage of psql in db:test:prepare
-
Merge pull request rails#4834 from sskirby/fix_usage_of_psql_in_db_te…
…st_prepare Fix usage of psql in db:test:prepare
Commits on Feb 25, 2012
-
-
Merge pull request rails#5164 from arunagw/build_fix_ruby187-p358
Build fix ruby187 p358
-
-
Merge pull request rails#5170 from arunagw/3-2-stable
assert => assert_equal
-
Fixed typo in composed_of example with Money#<=>, was comparing amoun…
…t itself instead of other_money.amount
-
-
Fixing Windows asset tag helper test failure
In asset_tag_helper_test.rb there is an assert on the number of bytes in a concatenated file. This test failed because Windows converts \n to \r\n as the default for "w". This is different than in *nix systems where there is no conversion done. THe test that failed was test_caching_stylesheet_link_tag_when_caching_on Using bin mode fixes this behavior on windows and makes no change on the *nix systems.
Commits on Feb 26, 2012
-
-
Revert "No need to pass options which is never used"
Options is needed for some Rails extensions to determine when referential integrity should be disabled This reverts commit bcb466c. Fixes rails#5052
Commits on Feb 27, 2012
-
Merge pull request rails#5179 from RalphShnelvar/Binary_mode_Window_bug
Binary mode window bug
-
Merge pull request rails#5190 from rafaelfranca/fix-393-3-2-stable
[3-2-stable] Add a new line after the textarea opening tag.
-
Commits on Feb 28, 2012
Commits on Feb 29, 2012
-
Merge pull request rails#5206 from kennyj/fix_5173-32
[3-2-stable] Fix type_to_sql with text and limit on mysql/mysql2. Fix GH rails#3931
Commits on Mar 1, 2012
-
-
Merge branch '3-2-stable-security' into 3-2-2
* 3-2-stable-security: Ensure [] respects the status of the buffer. delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options
-
-
Merge branch '3-2-2' into 3-2-stable
* 3-2-2: bumping to 3.2.2 Ensure [] respects the status of the buffer. Merge pull request rails#4834 from sskirby/fix_usage_of_psql_in_db_test_prepare Merge pull request rails#5084 from johndouthat/patch-1 updating RAILS_VERSION delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options
Commits on Mar 2, 2012
-
revert setting NOT NULL constraints in add_timestamps
Commit 3dbedd2 added NOT NULL constraints both to table creation and modification. For creation the new default makes sense, but the generic situation for changing a table is that there exist records. Those records have no creation or modification timestamps, and in the general case you don't even know them, so when updating a table these constraints are not going to work. See a bug report for this use case in rails#3334.
-
Stop SafeBuffer#clone_empty from issuing warnings
Logic in clone_empty method was dealing with old @dirty variable, which has changed by @html_safe in this commit: rails@139963c This was issuing a "not initialized variable" warning - related to: rails#5237 The logic applied by this method is already handled by the [] override, so there is no need to reset the variable here.
-
-
only log an error if there is a logger. fixes rails#5226
Conflicts: activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
Commits on Mar 3, 2012
-
Turn off verbose mode of rack-cache, we still have X-Rack-Cache to ch…
…eck that info Closes rails#5245
-
CSS fix for guides. Closing rails#5028 [ci skip]
In Ubuntu Chrome, in the last lines of code blocks, the underscore isn't visible. Increasing the line height slightly seems to fix this. This problem doesn't exist in Firefox even on Ubuntu. Too lazy to test in any other OS-browser combo :)
Commits on Mar 4, 2012
-
fix associations when using per class databases
would get ConnectionNotEstablished error because it always tried to use ActiveRecord::Base's connection, even though it should be using the connection of the model whose context we're operating in
-
-
Whitelist all attribute assignment by default.
Change the default for newly generated applications to whitelist all attribute assignment. Also update the generated model classes so users are reminded of the importance of attr_accessible.
Commits on Mar 5, 2012
-
Only add the whitelist_attributes option if ActiveRecord is present
Conflicts: railties/test/generators/app_generator_test.rb railties/test/isolation/abstract_unit.rb
-
Merge pull request rails#5278 from rafaelfranca/fix-build-3-2
[3-2-stable] Fix build
-
Fix rails#5069 - Protect foreign key from mass assignment throught as…
…sociation builder
Commits on Mar 6, 2012
-
-
Always passing a respond block from to responder
We should let the responder to decide what to do with the given overridden response block, and not short circuit it. Fixes rails#5280
-
Merge pull request rails#5299 from sikachu/3-2-stable-fix-responder
Always passing a respond block from to responder
-
Increasing minimum version of mail due to security vulnerability foun…
…d in Mail 2.4.1 for sendmail or exim
Mikel Lindsaar committedMar 6, 2012 -
-
Commits on Mar 7, 2012
-
-
-
-
Merge pull request rails#5316 from Jacobkg/master
Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings
-
Add tests to test that through associations are not readonly, and we …
…can update the records we retrive from the association
Commits on Mar 8, 2012
-
fix ArgumentError being raised in case of invalid byte sequences
Michael Reinsch committedMar 8, 2012 -
-
-
-
In a nested resource route, the parent resource param is <resource_na…
…me>_id This fix was made by @coreyhaines on docrails and merged in master. Cleanly cherry picking into 3-2-stable wasn't possible.
-
-
-
make active_connection? return true only if there is an open connecti…
…on in use for the current thread. fixes rails#5330
Commits on Mar 9, 2012
-
-
Add test case to has_many through association when mass_assignment_sa…
…nitizer is :strict Conflicts: activerecord/test/models/person.rb
-
-
Fix my name in the CHANGELOG to follow the convention
Also add missing entries and use the formating convention
-
Merge pull request rails#5350 from rafaelfranca/changelog-fix-3-2
Changelog fix 3 2
-
Merge pull request rails#5347 from rafaelfranca/fix-has_many_associat…
…ion-3-2 [3-2-stable] Fix has many through associations when mass_assignment_sanitizer is :strict
Commits on Mar 12, 2012
-
Add dynamic find_or_create_by_{attribute}! method.
(cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/dynamic_finder_match.rb
-
inline docs for clear_active_connections! no longer says it cleans de…
…ad threads, it doesn't since 3.2.0
-
Merge pull request rails#5391 from jrochkind/connection_pool_doc
ConnectionPooll#clear_active_connections! rdoc inaccuracy since 3.2.0
Commits on Mar 13, 2012
-
Fixed problem when fixture_path is not always defined (incidentally, …
…only when ActiveRecord is according to test_help.rb).
-
fix activerecord query_method regression with offset into Fixnum
add test to show offset query_methods on mysql & mysql2 change test to cover public API
-
Merge pull request rails#5398 from parndt/fix_issue_5193
Fix issue 5193
-
-
-
Merge pull request rails#5410 from rafaelfranca/fix-scaffold-3-2
[3-2-stable] Do not use the attributes hash in the scaffold functional tests
-
[3-2-stable] Fix GH rails#5399. connection_pools's keys are ActiveRec…
…ord::Base::ConnectionSpecification objects.
-
-
-
Merge pull request rails#5417 from kennyj/fix_5399-32
[3-2-stable] Fix GH rails#5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.
-
ConnectionPool.checkout takes account of ruby using 'non-blocking con…
…dition variables' in mutex ConditionVariables
Commits on Mar 14, 2012
-
Merge pull request rails#5423 from jrochkind/checkout_account_for_mon…
…itor_model ConnectionPool.checkout needs to be restructured to take account of ruby's "non-blocking" strategy for mutex ConditionVariables
-
Do not include the authenticity token in forms where remote: true as …
…ajax forms use the meta-tag value
-
Allow you to force the authenticity_token to be rendered even on remo…
…te forms if you pass true
Commits on Mar 15, 2012
-
Remove ActionController::TestCase#rescue_action_in_public!
This method has no effect since exception handling was moved to middlewares and ActionController tests do not use any middlewares.
-
Merge pull request rails#5338 from mreinsch/3-2-static_invalid_byte_s…
…equence 3 2 static invalid byte sequence
-
Merge pull request rails#5437 from kennyj/fix_5430
Fix GH rails#5430. A Payload name for schema_search_path should be SCHEMA.
-
Merge pull request rails#5456 from brianmario/redirect-sanitization
Strip null bytes from Location header
-
Merge pull request rails#5457 from brianmario/typo-fix
Fix typo in redirect test
Commits on Mar 17, 2012
-
Fix rails#5440 - multiple render_to_string breaks partials formats
This fixes situation where rendering template to string sets `rendered_format` to the format rendered there. This is ok to have consistent formats rendered in partials, but it breaks on next renders if format is explicitly set or on last render where default format does not necessarily need to be the format of first rendered template.
-
Commits on Mar 18, 2012
-
-
Merge pull request rails#5493 from kennyj/fix_5435-32
[3-2-stable] Fix GH rails#5435. db:structure:dump should be re-enable.
-
-
Merge pull request rails#5498 from arunagw/build_fix_app_generator_te…
…st_3-2-stable Build fix app generator test 3 2 stable
Commits on Mar 19, 2012
-
Increase minimum version of mail.
Second security vulnerability found in mail file delivery method patched in version 2.4.4.
Mikel Lindsaar committedMar 19, 2012 -
-
Merge pull request rails#5505 from arunagw/build_fix_1.8.7-3-2-stable
Build fix 1.8.7 3 2 stable
Commits on Mar 20, 2012
-
We dont need to merge in the parameters as thats all being reset by t…
…he rack headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)
Commits on Mar 21, 2012
-
-
-
Merge pull request rails#5533 from mhfs/migration_blank_line_3_2
[3-2-stable] Remove blank line from generated migration
-
[3-2-stable] Port of rails#5522 'Fix adding/removing field's index wh…
…en generating migration'
Commits on Mar 22, 2012
-
Merge pull request rails#5542 from mhfs/port_5522_to_32stable
Port of rails#5522 'Fix adding/removing field's index when generating migration'
-
Merge pull request rails#5525 from kennyj/fix_5411
Fix GH rails#5411. When precompiling, params method is undefined.
Commits on Mar 23, 2012
-
Add order to tests that rely on db ordering, to fix failing tests on pg
Also skip persistente tests related to UPDATE + ORDER BY for postgresql PostgreSQL does not support updates with order by, and these tests are failing randomly depending on the fixture loading order now.
-
Merge pull request rails#5557 from carlosantoniodasilva/fix-build-3-2
Fix build for branch 3-2-stable
-
-
Merge pull request rails#5558 from carlosantoniodasilva/fix-build-3-2
Fix build for branch 3-2-stable - Part 2
-
Merge pull request rails#5537 from kennyj/fix_4399-32
[3-2-stable] migrate(:down) method with table_name_prefix
Commits on Mar 24, 2012
-
Return the same session data object when setting session id
Make sure to return the same hash object instead of returning a new one. Returning a new one causes failures on cookie store tests, where it tests for the 'Set-Cookie' header with the session signature. This is due to the hash ordering changes on Ruby 1.8.7-p358.
Commits on Mar 26, 2012
-
-
-
Merge pull request rails#5596 from lest/patch-3
apply form_for namespace option to date_select
-
Merge pull request rails#5597 from carlosantoniodasilva/fix-build-3-2
Fix build for branch 3-2-stable - return the same session hash object
Commits on Mar 27, 2012
-
Merge pull request rails#2621 from icco/master
Issue with schema dump
-
If partial is rendered in controller, grab format from template
Previously `rendered_format` was set only based on mime types passed in Accept header, which was wrong if first type from Accept was different than rendered partial. The fix is to simply move setting rendered_format to the place where template is available and grab format from the template. If it fails we can fallback to formats passed by Accept header.
-
Merge pull request rails#5603 from drogus/fix-rendered-format-for-ren…
…der-partial Fix rendered format for render partial
-
Fixing issue rails#2492. ActionView::Base.field_error_proc doesn't ca…
…ll for label. objectify_options method should be applied to the proper options arg. See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
-
-
Merge pull request rails#5618 from lest/patch-1
force datetime attributes to be changed
-
Don't break Haml with textarea newline fix.
See issue rails#393, issue rails#4000, issue rails#5190, and issue rails#5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.) Also fix 6 more tests that didn't yet have the newline expectation.
-
-
Merge pull request rails#5619 from jcoleman/textarea-newline-fix-brea…
…ks-haml Textarea newline fix breaks haml (3-2-stable)
-
Merge pull request rails#5619 from jcoleman/textarea-newline-fix-brea…
…ks-haml Textarea newline fix breaks haml (3-2-stable)
-
Merge pull request rails#5622 from rafaelfranca/fix-2492-3-2
[3-2-stable] Fix label_tag to merge the options hash with the object hash
Commits on Mar 28, 2012
-
-
Merge pull request rails#5616 from cbartlett/migration-indent
Fix indenting in migration generator
-
Added config.action_view.embed_authenticity_token_in_remote_forms
There is a regression introduced in 16ee611, which breaks remote forms that should also work without javascript. This commit introduces config option that allows to configure this behavior defaulting to the old behavior (ie. include authenticity token in remote forms by default)
-
Merge pull request rails#5633 from drogus/embed-auth-token-in-remote-…
…forms Embed auth token in remote forms
-
Merge pull request rails#5633 from drogus/embed-auth-token-in-remote-…
…forms Embed auth token in remote forms
-
Cherry-picked from e96d04a. Conflicts: activerecord/lib/active_record/attribute_methods/read.rb
-
-
Cover one more case in auth_token and remote forms
If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it.
-
Cover one more case in auth_token and remote forms
If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it.
-
Change the order argument from ('id') to ('taggings.id')
to address ORA-00918 error
-
Merge pull request rails#5640 from yahonda/address_ora_00918_with_oracle
Address an error for test_has_many_through_polymorphic_has_one with Oracle
-
Changed the config.assets.manifest to nil in the comments in the prod…
…uction config template.
Commits on Mar 29, 2012
-
Merge pull request rails#5644 from andhapp/fix-config-asset-manifest-3-2
Changed the config.assets.manifest to nil
-
-
-
Commits on Mar 30, 2012
-
-
Do not add record to identity map if the record doesn't have values f…
…or all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.
-
refactor the checking of the attributes of the record in IdentityMap#…
…add, so it's more readable
-
refactor instantiate method in base, so we remove nesting if's which …
…make the code harder to read. Minor changes to contain_all_columns in IdentityMap. Conflicts: activerecord/lib/active_record/base.rb
-
-
-
Fix rails#5667. Preloading should ignore scoping.
Conflicts: activerecord/test/cases/associations/eager_test.rb
-
-
-
Merge pull request rails#5662 from arturopie/3-2_fixing_IM_when_using…
…_find_select Fixing Identity Map when using find select in rails 3.2
Commits on Mar 31, 2012
Commits on Apr 1, 2012
-
Usage file in generators shouldn't be fetched only based on source_root
In case `source_roout` is not set, `default_source_root` is used, which includes also `templates` directory. If there is no `templates` directory, `default_source_root` is not available and USAGE will not be displayed. USAGE should be also checked based on default directory excluding `templates`.
Commits on Apr 3, 2012
Commits on Apr 4, 2012
-
-
-
-
Merge pull request rails#5727 from hone/ar_database_url_logging
ActiveRecord configuration logging
-
Merge pull request rails#5188 from jlxw/patch-1
logger.silence is deprecated
-
-
Merge pull request rails#5737 from rafaelfranca/3-2-stable
Fix tests of benchmark with silence equals to true
Commits on Apr 6, 2012
-
-
Merge pull request rails#5765 from anildigital/3-2-stable
Update getting started guide to change Rails version to Rails 3.2
Commits on Apr 7, 2012
Commits on Apr 9, 2012
-
-
Merge pull request rails#5784 from rafaelfranca/default_url-3-2
[3-2-stable] Document that default_url_options must return a hash with symbolized keys
-
rewords the section about default_url_options in the Action Controlle…
…r Overview guide
-
Merge pull request rails#5725 from kevmoo/remove_unused_castcode
Remove unused castcode
Commits on Apr 10, 2012
-
-
-
bigdecimal can be duped on Ruby 2.0
Conflicts: activesupport/test/core_ext/duplicable_test.rb
-
-
Merge pull request rails#5800 from arunagw/bigdecimal_dup
Backport BigDecimal#duplicable? feature check from master
Commits on Apr 12, 2012
Commits on Apr 15, 2012
-
angelo giovanni capilleri authored and angelo giovanni capilleri committed
Apr 15, 2012