Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
...
head fork: rails/rails
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Nov 19, 2012
@senny senny backport #8262, require bundler groups to include rake-tasks in engines
If you generate a full engine, this will include rake tasks from
your gem under the `app` namespace. For example if you have a dependency
on `rspec-rails` in your engine's `gemspec`. You will get the task `app:spec`

Closes #8229

Conflicts:

	railties/CHANGELOG.md
da6951a
@rafaelfranca rafaelfranca Merge pull request #8271 from senny/backport_8262
backport #8262, require bundler groups to include rake-tasks in engines
db67652
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8258 from kommen/eager_loading_with_select_test2
Add test to ensure preloading works as expected with "group", "select" and "includes".
Conflicts:
	activerecord/test/cases/relations_test.rb

Chery-pick a739340:
Ensure ordering to make the test pass with postgresql

Conflicts:
	activerecord/test/cases/relations_test.rb
0077b41
@carlosantoniodasilva carlosantoniodasilva Be a bit less conservative with mysql in adapter
This will allow the new mysql 2.9.0 to be used, fixing our test issues.
bd87bd9
Commits on Nov 20, 2012
@rafaelfranca rafaelfranca Merge pull request #8276 from pwnall/pgsql_text_limits
Postgresql doesn't accepts limits on text columns
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
50f0046
@rafaelfranca rafaelfranca Merge pull request #8280 from asanghi/fix_guide_field_with_error_proc
fix guide with field_with_error proc example

[ci skip]
4e00e8e
Commits on Nov 22, 2012
@senny senny backport #8291, prevent mass assignment of polymorphic type with `build`
Closes #8265

Conflicts:

	activerecord/CHANGELOG.md
	activerecord/lib/active_record/associations/association.rb
d397a38
@rafaelfranca rafaelfranca Merge pull request #8295 from senny/8265_backport
backport #8291, prevent mass assignment of polymorphic type with `build`
83e7105
Commits on Nov 26, 2012
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8311 from alisdair/dirty-nullable-datetime
Don't call will_change! for datetime nil->"".

Setting a nil datetime attribute to a blank string should not cause the
attribute to be dirty.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
6fe1a4a
@tenderlove tenderlove speed up fixture loading by querying the schema cache for column names 978ec98
@tenderlove tenderlove schema cache already has the columns as a hash, so use that 5167665
@steveklabnik steveklabnik Add i18n scope to disance_of_time_in_words.
This is a backport of rails/rails#7997.
1a876f6
@rafaelfranca rafaelfranca Merge pull request #8321 from steveklabnik/backport_7997
Add i18n scope to disance_of_time_in_words.
924018f
@steveklabnik steveklabnik @steveklabnik can't spell 'distance.' 767879c
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8325 from steveklabnik/backport_7997
@steveklabnik can't spell 'distance.' [ci skip]
17d64a1
@tenderlove tenderlove schema cache already has the columns as a hash, so use that
Commits

  978ec98 and
  5167665

changed database statements to use the schema_cache methods, added on
master in

  c99e34e and
  dc973e7

But apparently the methods weren't added to schema_cache, resulting in
the failure described in #8322 for 3-2-stable.

Fixes #8322.

Conflicts:
	activerecord/lib/active_record/connection_adapters/schema_cache.rb
941f019
@elia elia Accept symbols as #send_data :disposition value 9c33cb2
Commits on Nov 28, 2012
@carlosantoniodasilva carlosantoniodasilva Use 1.8 hash style in pg specific schema 26e8cb8
@jeremy jeremy Work around undiagnosed bug that's draining a relation's bind_values 06cc38a
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8327 from elia/fix-send-data-disposition-with-sym…
…bols

Accept symbols as #send_data :disposition value
9d97ef8
@tenderlove tenderlove Merge pull request #7689 from cbarton/assume_migration_version_with_p…
…refix_fix

Fixing a schema:load when using a prefix and suffix on the tables [Reopen/backport]
66e87b7
Commits on Nov 29, 2012
@rafaelfranca rafaelfranca Merge pull request #8352 from steveklabnik/update_7858
Specify type of singular assication during serialization
Conflicts:
	activemodel/CHANGELOG.md
	activemodel/test/cases/serializers/xml_serialization_test.rb
e8c3605
@jeremy jeremy Backport 78b30fe to fix non-utf-8 databases mistakenly getting utf8 c…
…ollation
db994b7
Commits on Nov 30, 2012
@route route Fixed description for ActiveSupport::Concern typical case 5b50c7d
@fxn fxn Merge pull request #8380 from route/fix-concern-description
Fixed description for ActiveSupport::Concern typical case
d7deec3
@tenderlove tenderlove Merge pull request #6397 from kennyj/fix_translate_exception
Fix a problem of translate_exception method in a Japanese (non English) environment.
564e32b
@rafaelfranca rafaelfranca Make the CHANGELOG consistent [ci skip] 25a15a7
@carlosantoniodasilva carlosantoniodasilva Use 1.8 hash style in xml serialization test a50ab21
Commits on Dec 02, 2012
@rafaelfranca rafaelfranca Merge pull request #8402 from senny/8376_descriptive_error_message_fo…
…r_partial_layout_true

More descriptive error when rendering a partial with `:layout => true`
Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_view/renderer/partial_renderer.rb
eaa0d0b
Commits on Dec 03, 2012
@hsbt hsbt handled respond_to? with private methods 127411f
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8405 from hsbt/fix-respond-initialize-dup
Handle respond_to? with private methods
19599c2
@jeremy jeremy Override <%== to always behave as literal text rather than toggling b…
…ased on whether escaping is enabled. Fixes that existing plaintext email templates using <%== unexpectedly flipped to *escaping* HTML when #8235 was merged.

Conflicts:
	actionpack/test/template/template_test.rb
9d6e502
@carlosantoniodasilva carlosantoniodasilva Use 1.8 hash style 5f28000
@carlosantoniodasilva carlosantoniodasilva Skip ruby-prof in Gemfile for Ruby 2.0 33ab32d
Commits on Dec 04, 2012
@carlosantoniodasilva carlosantoniodasilva Use send in Time marshal extensions since the methods are now private
See ruby/ruby@9c1b316

All Active Support tests pass in 2.0.0preview2 after this change.
Closes #8409
1a5caf1
@josevalim josevalim Merge pull request #4942 from bogdan/pluck_joins
AR::Relation#pluck: improve to work with joins

Conflicts:
	activerecord/lib/active_record/relation/calculations.rb
	activerecord/test/cases/calculations_test.rb
a878126
@jeremy jeremy Bump mailer to quiet the stdout log messages
Conflicts:
	actionmailer/actionmailer.gemspec
dac811e
@senny senny backport #8403, no intermediate AR objects when eager loading.
Closes #3313

Conflicts:

	activerecord/CHANGELOG.md
	activerecord/test/models/developer.rb
1b96176
@rafaelfranca rafaelfranca Merge pull request #8413 from senny/8403_backport
backport #8403, no intermediate AR objects when eager loading.
549da0d
@pixeltrix pixeltrix Make output of distance_of_time_in_words consistent
This commit fixes the output of distance_of_time_in_words when
using integer or duration arguments. Previously a distance of
more than 30 seconds would be output as 'Less than 1 minute'
when using integer arguments and '1 minute' when using two
Time instances more than 30 seconds apart.

Cherry picked from 5fdd4cd
18e1227
@pixeltrix pixeltrix Make distance_of_time_in_words work with DateTime offsets
Because DateTime#to_time returns self when it has a non-zero offset
and subtracting two DateTime instances returns a Rational then the
distance_of_time_in_words methods outputs an incorrect value.

This is fixed in master because we can rely on Ruby 1.9.3's
implementation of to_time but it can't be fixed on Ruby 1.8.7 as
there is no way to map the DateTime to a Time with a non-zero offset.

We can workaround the problem by casting to Float before doing
the subtraction in the distance_of_time_in_words method.

Closes #8390
fbf23ed
Commits on Dec 05, 2012
@rafaelfranca rafaelfranca Merge pull request #8417 from kennyj/fix_8414
Fix #8414. Performance problem with postgresql adapter primary_key function.
Conflicts:
	activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
d70539c
Commits on Dec 07, 2012
@carlosantoniodasilva carlosantoniodasilva Unscope update_column(s) query to ignore default scope
When applying default_scope to a class with a where clause, using
update_column(s) could generate a query that would not properly update
the record due to the where clause from the default_scope being applied
to the update query.

    class User < ActiveRecord::Base
      default_scope where(active: true)
    end

    user = User.first
    user.active = false
    user.save!

    user.update_column(:active, true) # => false

In this situation we want to skip the default_scope clause and just
update the record based on the primary key. With this change:

    user.update_column(:active, true) # => true

Backport of #8436 fix.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/persistence.rb
	activerecord/test/cases/persistence_test.rb
a3c3cfd
Commits on Dec 10, 2012
@senny senny revised the actionmailer's CHANGELOG structure d1b9c5f
@senny senny Backport #8450, the return value from mailer methods is not relevant.
Conflicts:

	actionmailer/CHANGELOG.md
	actionmailer/lib/action_mailer/base.rb
9b72c36
@rafaelfranca rafaelfranca Merge pull request #8477 from senny/backport_8448
Backport #8450, the return value from mailer methods is not relevant.
86e1f45
@rafaelfranca rafaelfranca Remove warning of unused variable c720ff7
@jacobstr jacobstr Added regression test for #8195. cc99580
@jeremy jeremy Merge pull request #6376 from jgaskins/timestamp-microseconds
Increase numeric-timestamp precision to nanoseconds
Conflicts:
	activesupport/lib/active_support/core_ext/time/conversions.rb
09a8b14
@rafaelfranca rafaelfranca Make sure the tests pass in the case closer to described in #8195 660882b
@rafaelfranca rafaelfranca Allow users to choose the timestamp format in the cache key
This can be done using the class attribute cache_timestamp_format

Closes #8195
b097652
@rafaelfranca rafaelfranca Add CHANGELOG entry for #6376. 0ef70b8
Commits on Dec 11, 2012
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8441 from itzki/fix_decorate_columns
Backport test to ensure there won't be regressions.
The issue only happens on master at the moment.
5924036
@carlosantoniodasilva carlosantoniodasilva Use 1.8 hash style :bomb: 454f112
@carlosantoniodasilva carlosantoniodasilva Run backported serialized test without Identity Map
It fails with Identity Map because the find call returns the same
object, so the "content" attribute that we expect to raise "missing
attribute" is actually present.
87a7e87
@carlosantoniodasilva carlosantoniodasilva Add :nsec format only for Ruby 1.9
Ruby 1.8 does not support this format in Time, so the format will only
be added to the available date formats on Ruby 1.9. Changelog entry was
changed to explain that as well.
64281fb
@carlosantoniodasilva carlosantoniodasilva Improve test name related to cache timestamp format [ci skip] 73f0d53
Commits on Dec 12, 2012
@rafaelfranca rafaelfranca Merge pull request #8490 from mattv/fix_request_raw_post
Fix rewinding in ActionDispatch::Request#raw_post
Conflicts:
	actionpack/CHANGELOG.md
6fbee4f
Commits on Dec 13, 2012
@senny senny recognize migrations, in folders containing numbers and 'rb'.
Backport of #8500
Closes #8492

Conflicts:

	activerecord/test/cases/migrator_test.rb
d68e299
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8504 from senny/backport_8492
Backport of #8500, recognize migrations, in folders containing numbers and 'rb'.
3bf4ddf
Commits on Dec 14, 2012
@pixeltrix pixeltrix Clear url helper methods when routes are reloaded
Clear url helper methods when routes are reloaded by removing the
methods explicitly rather than just clearing the module because it
didn't work properly and could be the source of a memory leak.

Closes #8488.
6ab1a95
@pixeltrix pixeltrix Don't use 1.9 hash syntax on 3-2-stable 9c581d3
Commits on Dec 15, 2012
@zbskii zbskii Remove unicode character encoding from ActiveSupport::JSON.encode
The encoding scheme (e.g. ☠ -> "\u2620") was broken for characters
not in the Basic Multilingual Plane.  It is possible to escape them
for json using the weird encoding scheme of a twelve-character
sequence representing the UTF-16 surrogate pair (e.g. '𠜎' ->
"\u270e\u263a") but this wasn't properly handled in the escaping code.
Since raw UTF-8 is allowed in json, it was decided to simply pass
through the raw bytes rather than attempt to escape them.

Backport of zbskii@9ace3a8

Conflicts:

	activesupport/CHANGELOG.md
	activesupport/lib/active_support/json/encoding.rb
	activesupport/test/json/encoding_test.rb
815a943
@carlosantoniodasilva carlosantoniodasilva Use 1.8 style hash in json encoding test df048b5
Commits on Dec 19, 2012
@senny senny Backport #8522, Keep index names when using with sqlite3
Conflicts:

	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
	activerecord/test/cases/migration/rename_column_test.rb
9f69d42
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8558 from senny/backport_3489
Backport #8522, Keep index names when using  with sqlite3
bf16699
Commits on Dec 21, 2012
@rafaelfranca rafaelfranca Serialized attribute can be serialized in an integer column
Fix #8575

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/attribute_methods/serialization.rb
	activerecord/test/cases/serialized_attribute_test.rb
	activerecord/test/models/person.rb
885f59f
Commits on Dec 23, 2012
@claudiob claudiob Add release date of Rails 3.2.9 to documentation
Conflicts:
	actionpack/CHANGELOG.md
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md
acc2aa4
@tenderlove tenderlove updating the changelog for the CVE 784a386
@tenderlove tenderlove updating the changelogs 6727ac6
@tenderlove tenderlove updating changelog 7d592ba
@tenderlove tenderlove CVE-2012-5664 options hashes should only be extracted if there are ex…
…tra parameters
325669f
@tenderlove tenderlove Merge branch '3-2-sec' into 3-2-secmerge
* 3-2-sec:
  CVE-2012-5664 options hashes should only be extracted if there are extra parameters
  updating changelog
  updating the changelogs
  updating the changelog for the CVE
  Add release date of Rails 3.2.9 to documentation

Conflicts:
	actionmailer/CHANGELOG.md
	actionpack/CHANGELOG.md
	activemodel/CHANGELOG.md
	activerecord/CHANGELOG.md
	activeresource/CHANGELOG.md
	activesupport/CHANGELOG.md
	railties/CHANGELOG.md
2aa70bd
@tenderlove tenderlove bumping version to 3.2.10 8ba3df0
Commits on Dec 26, 2012
@senny senny backport #8616, quote column names in generated fixture files
Conflicts:

	railties/CHANGELOG.md
	railties/lib/rails/generators/test_unit/model/model_generator.rb
	railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
	railties/test/generators/model_generator_test.rb
5203b6d
@rafaelfranca rafaelfranca Merge pull request #8618 from senny/backport_8612
backport #8616, quote column names in generated fixture files
8c938dd
@rafaelfranca rafaelfranca Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options.
Fix #8621

[Colin Kelley + Rafael Mendonça França]
93366c7
@rafaelfranca rafaelfranca Revert "Fix `validates_presence_of` with `:allow_nil` or `:allow_blan…
…k` options."

This reverts commit 93366c7.

REASON: This is backward incompatible. Also this behavior is documented
on the guides.
d38c8ca
Commits on Dec 31, 2012
@senny senny backport #8662, charset should not be appended for `head` responses
      1) Failure:
    test_head_created_with_image_png_content_type(RenderTest) [test/controller/render_test.rb:1238]:
    Expected: "image/png"
      Actual: "image/png; charset=utf-8"
55a886b
@spastorino spastorino Merge pull request #8665 from senny/8661_should_not_append_charset_if…
…_already_present

backport #8662, charset should not be appended for `head` responses
e48dc19
@spastorino spastorino Revert "Merge pull request #8665 from senny/8661_should_not_append_ch…
…arset_if_already_present"

This reverts commit e48dc19, reversing
changes made to d38c8ca.
348870d
@fxn fxn removes the Ajax on Rails early draft
There was a few attempts at writing this guide, but we
never passed from the work in progress stage. In spite
of not being included in the table of contents, this
draft was still indexed by bots and showed up in searches.

Steve Klabnik has written "Working with JavaScript in Rails"
which is going to be released with Rails 4. So better get
rid of this altogether.
b366ec5
Commits on Jan 02, 2013
@jasl jasl fix block.arity raise nil error when not given a block to "content_ta…
…g_for"
ea881ca
@rafaelfranca rafaelfranca Merge pull request #8640 from jasl/3-2-stable
fix block.arity will raise nil error
204109e
@tenderlove tenderlove Merge branch '3-2-stable' into 3-2-secmerge
* 3-2-stable:
  fix block.arity raise nil error when not given a block to "content_tag_for"
  removes the Ajax on Rails early draft
  Revert "Merge pull request #8665 from senny/8661_should_not_append_charset_if_already_present"
  backport #8662, charset should not be appended for `head` responses
  Revert "Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options."
  Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options.
  backport #8616, quote column names in generated fixture files
e5ee5a9
@rafaelfranca rafaelfranca Improve CHANGELOG message [ci skip] 970c10c
@rafaelfranca rafaelfranca Add release date of 3.2.10
Fix format and wrong changelog entry
f4dc7e3
@senny senny Backport #8701, do not append a second slash with `trailing_slash: true` 33841a9
@rafaelfranca rafaelfranca Merge pull request #8703 from senny/backport_8700
Backport #8701, do not append a second slash with `trailing_slash: true`

Closes #8700
f8452e8
Commits on Jan 03, 2013
@rafaelfranca rafaelfranca Use Ruby 1.8 syntax 4d4e6e2
@miguelff miguelff Merge tag 'v3.2.10' into 3-2-stable
Latest released tag was not fully merged into the stable branch (missed version bumping)
2e4df2a
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8719 from pcasaretto/fix-actionview-doc-typo
Fix typo on form_tag_helper.rb [ci skip]
4179470
@rafaelfranca rafaelfranca Merge pull request #8716 from miguelff/3-2-stable
Merged latest released tag (v3.2.10) into the stable branch (3-2-stable)
ef727a6
@amatsuda amatsuda update directory tree in the generated README
[ci skip]
3a9db02
@rafaelfranca rafaelfranca Merge pull request #8733 from amatsuda/rails32_readme_dir_tree
update directory tree in the generated README in Rails 3.2

[ci skip]
229042f
Jason Stirk Fix undefined method `to_i' introduced since 3.2.8
This commit fixes a bug introduced in 96a13fc which breaks behaviour of
integer fields in 3.2.8.

In 3.2.8, setting the value of an integer field to a non-integer (eg.
Array, Hash, etc.) would default to 1 (true) :

    # 3.2.8
    p = Post.new
    p.category_id = [ 1, 2 ]
    p.category_id # => 1
    p.category_id = { 3 => 4 }
    p.category_id # => 1

In 3.2.9 and above, this will raise a NoMethodError :

    # 3.2.9
    p = Post.new
    p.category_id = [ 1, 2 ]

    NoMethodError: undefined method `to_i' for [1, 2]:Array

Whilst at first blush this appear to be sensible, it combines in bad
ways with scoping.

For example, it is common to use scopes to control access to data :

    @collection = Posts.where(:category_id => [ 1, 2 ])
    @new_post = @collection.new

In 3.2.8, this would work as expected, creating a new Post object
(albeit with @new_post.category_id = 1). However, in 3.2.9 this will
cause the NoMethodError to be raised as above.

It is difficult to avoid triggering this error without descoping before
calling .new, breaking any apps running on 3.2.8 that rely on this
behaviour.

This patch deviates from 3.2.8 in that it does not retain the somewhat
spurious behaviour of setting the attribute to 1. Instead, it explicitly
sets these invalid values to nil :

    p = Post.new
    p.category_id = [ 1, 2 ]
    p.category_id # => nil

This also fixes the situation where a scope using an array will
"pollute" any newly instantiated records.

    @new_post = @collection.new
    @new_post.category_id # => nil

Finally, 3.2.8 exhibited a behaviour where setting an object to an
integer field caused it to be coerced to "1". This has not been
retained, as it is spurious and surprising in the same way that setting
Arrays and Heshes was :

    c = Category.find(6)
    p = Post.new

    # 3.2.8
    p.category_id = c
    p.category_id # => 1

    # This patch
    p.category_id = c
    p.category_id # => nil

This commit includes explicit test cases that expose the original issue
with calling new on a scope that uses an Array. As this is a common
situation, an explicit test case is the best way to prevent regressions
in the future.

It also updates and separates existing tests to be explicit about the
situation that is being tested (eg. AR objects vs. other objects vs.
non-integers)
e842dbb
@rafaelfranca rafaelfranca Merge pull request #8718 from jstirk/column_writer_to_i_errors
Fix undefined method `to_i' introduced since 3.2.8
9a44cd1
Commits on Jan 04, 2013
@rafaelfranca rafaelfranca Change the encrypted campfire notification token
Conflicts:
	.travis.yml
6b9cb71
Commits on Jan 05, 2013
@hsbt hsbt backport #4f0f1b5 into 3-2-stable. because 1.9.3-p362 warned unused v…
…ariables.

Conflicts:
	actionpack/test/controller/render_test.rb
8a1ba01
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8763 from hsbt/backport-to-hide-warning
Backport 4f0f1b5 into 3-2-stable.

When running the test with warnings enabled, it fails without this change.
665e11e
@jcoglan jcoglan Remove suggestion that Procs can be used as session secrets.
(cherry picked from commit 6500d79)

[ci skip]

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
1506d4d
Commits on Jan 06, 2013
@carlosantoniodasilva carlosantoniodasilva Do not call fields_for from form_for, to avoid instantiating two buil…
…ders

Conflicts:
	actionpack/lib/action_view/helpers/form_helper.rb
	actionpack/test/template/form_helper_test.rb
756188b
@trisweb trisweb Fix error when assigning NaN to an integer column
Also covers any non-castable case by returning nil, which
is in-line with the intention of the former implementation,
but covers the odd cases which respond to to_i but raise
an error when it's called, such as NaN, Infinity and -Infinity.

Fixes #8757

Backport of #8781

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/column_test.rb
c147dd7
@rafaelfranca rafaelfranca Remove warnings 7945661
@rafaelfranca rafaelfranca Test only with Ruby 1.9+ 80343f6
Commits on Jan 07, 2013
@rafaelfranca rafaelfranca connection_parameters is an Array and will never have
prepared_statements as value
831aad2
@carlosantoniodasilva carlosantoniodasilva Fix named scope + class method example
Closes #8804 [ci skip]

Conflicts:
	activerecord/lib/active_record/scoping/named.rb
040ff5b
@carlosantoniodasilva carlosantoniodasilva Remove not used variable in eager test 3aebe13
@noahsilas noahsilas Fix javascript_include_tag when no js runtime is available
In a production environment where the assets have been precompiled, we
don't want an assets compile step to happen on the application server at
all. To ensure this, a js runtime may not be available on the app
servers. In this environment, pages using javascript_include_tag for
assets with non-standard or chained extensions were throwing 500 errors.
For instance, `javascript_include_tag('jquery.min')` would blow up.

Sprockets was attempting to build the assets being included during the
rewrite_extension step (responsible for appending a '.js' extension to
assets being included by the basename rather than a fully qualified
name). This was happening as a step to resolve #6310, which required
checking for the presence of an asset with a non-standard extension
before appending the extension.

We can check for the presence of an asset without invoking the asset
build step by using Sprockets' resolve method, which will search for the
base file without building it (and is the method that find_asset uses
internally to get the path to the asset before attempting to build it).

When rewriting the extension on an asset, these are the steps:
- If the source does not have an extension, assume that the default
  extension is desired and append it.
- If there is an extension and it doesn't match the default extension,
  check to see if a file with the precise name specified exists amongst
  the assets; if it is present, do not append the default extension.
  (This is the step that resolves #6310).
9bc5e65
@carlosantoniodasilva carlosantoniodasilva Refactor write attribute logic to convert number column value
This is an improvement for issue #8673:
    "Comparing a BigDecimal to true/false on write_attribute is slow"

It seems to be an issue with Ruby itself, related to the "coerce" method
being called in TrueClass/FalseClass due to the == condition, triggering
method_missing, then raising a NameError that's later catched.

This issue was also opened in Ruby tracker:
    https://bugs.ruby-lang.org/issues/7645.

This refactoring avoid the coerce call by using a case statement, which
gives us better readability as well. A simple benchmark:

----------

require 'benchmark/ips'
require 'bigdecimal'

Benchmark.ips do |x|
  x.report("== true")   { BigDecimal('3') == true }
  x.report("TrueClass") { TrueClass === BigDecimal('3') }
  x.report("== 0")      { BigDecimal('3') == 0 }
  x.report("Numeric")   { Numeric === BigDecimal('3') }
end

Calculating -------------------------------------
             == true      6427 i/100ms
           TrueClass     47297 i/100ms
                == 0     35923 i/100ms
             Numeric     55530 i/100ms
-------------------------------------------------
             == true    75878.5 (±21.6%) i/s -     359912 in   5.004392s
           TrueClass  1249547.0 (±13.1%) i/s -    6148610 in   5.035964s
                == 0   666856.3 (±13.3%) i/s -    3268993 in   5.013789s
             Numeric  1269300.9 (±11.3%) i/s -    6274890 in   5.028458s

----------

Master has a very different implementation, and there are apparently no
similar conversions at this point, it's mainly delegated to the column
type cast, but I'll check if something needs to be changed there as well.

Closes #8673.
c75b5a8
Commits on Jan 08, 2013
@spastorino spastorino Avoid Rack security warning no secret provided
This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie."
d9a0480
@nashby nashby Wrap time ranges with timezones, closes #8807
(cherry picked from commit e2e5136)
(cherry picked from commit dcdde7d)

Backport of #6183, original issue was #6179

Conflicts:
	activesupport/lib/active_support/core_ext/time/calculations.rb
	activesupport/test/core_ext/time_ext_test

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
d39d878
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8812 from rubys/master
Eliminate Rack::File headers deprecation warning
54faddf
@carlosantoniodasilva carlosantoniodasilva Bump rack dependency to 1.4.3
It includes security bug fixes and changes the initialization of
Rack::File to accept a hash, otherwise generating warnings.

See 295806e for the warnings fix.

Conflicts:
	actionpack/actionpack.gemspec
3debd57
@carlosantoniodasilva carlosantoniodasilva Changelog improvements [ci skip] f64be7d
@spastorino spastorino Avoid Rack security warning no secret provided
This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie."
95fe9ef
@tenderlove tenderlove * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] …
…* dealing with empty hashes. Thanks Damien Mathieu
d5cd97b
@jeremy jeremy CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. 43109ec
@tenderlove tenderlove bumping version 746dbd8
@tenderlove tenderlove Merge branch '3-2-sec' into 3-2-secmerge
* 3-2-sec:
  bumping version
  CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.
  * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu
  Avoid Rack security warning no secret provided

Conflicts:
	actionpack/CHANGELOG.md
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md
48810a5
@yahonda yahonda Ignore binds payload with nil column in AR log subscriber
Some tests were raising the following error:

    Could not log "sql.active_record" event. NoMethodError: undefined method
    `type' for nil:NilClass`

Due to the way binds were being logged, the column info was considered
always present, but that is not true for some of the tests listed in the
issue.

Closes #8806.

Conflicts:

	activerecord/lib/active_record/log_subscriber.rb
	activerecord/test/cases/log_subscriber_test.rb

Conflict resolution:
- Revert ruby 1.9 style hash to support ruby 1.8
- Do not include 8f59ffc into 3-2-stable
3d1a879
Commits on Jan 09, 2013
@sikachu sikachu Remove test for XML YAML parsing
The support for YAML parsing in XML has been removed from Active Support
since it introduced an security risk. See 43109ec for more detail.
e134e17
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8834 from sikachu/3-2-stable-fix-ars
Remove test for XML YAML parsing
45b17ce
@rafaelfranca rafaelfranca Merge pull request #8838 from yahonda/8806_3-2-stable
Ignore binds payload with nil column in AR log subscriber
8313f3c
@carlosantoniodasilva carlosantoniodasilva Update changelogs with release date [ci skip] 11f5deb
Commits on Jan 10, 2013
@jejacks0n jejacks0n Fixes issue where duplicate assets can be required with sprockets.
- addresses the problem by calling flatten on asset array before calling uniq.
- adds note to CHANGELOG.
f55ef82
@guilleiguaran guilleiguaran Merge pull request #8735 from jejacks0n/duplicate_asset_fix
Ensure assets aren't duplicated when using sprockets require.
002dfba
@guilleiguaran guilleiguaran Merge pull request #8756 from causes/js_include_tag_fix
Fix javascript_include_tag when no js runtime is available
686307c
@carlosantoniodasilva carlosantoniodasilva Reorder AP changelog and remove duplicated entry [ci skip]
Duplicated entry added in 002dfba.
d564ee0
Commits on Jan 11, 2013
@dylanahsmith dylanahsmith Fix JSON params parsing regression for non-object JSON content.
Backports #8855.
7003b36
@jeremy jeremy Merge pull request #8888 from dylanahsmith/3-2-parse-non-object-json-…
…params

3-2-stable: Fix JSON params parsing regression for non-object JSON content.
3211eb1
@ernie ernie Revert "Merge pull request #7661 from ernie/build-join-records-on-uns…
…aved-hmt"

This reverts commit ee43989.

It would appear that #7661 had unintended consequences to the API. Until
we can sort those out, this should not be in 3.2.x, and wait for 4.0.0.
18b9187
@rafaelfranca rafaelfranca Merge pull request #8895 from ernie/revert-hmt-on-unsaved-in-3-2
Revert hm:t on unsaved collection for 3.2
2c5e0ad
Commits on Jan 12, 2013
@pixeltrix pixeltrix Remove unnecessary caching of ParameterFilter 0db9b13
@rafaelfranca rafaelfranca Merge pull request #8907 from rubys/master
Fix regression introduced in pull 8812
7c62a75
Commits on Jan 14, 2013
@dkubb dkubb Fix DateTime comparison with DateTime::Infinity object 688d529
@gsphanikumar gsphanikumar Test to allow Range including DateTime and DateTime::Infinity
Closes #8587
b1a501e
@rafaelfranca rafaelfranca Merge pull request #8927 from dkubb/issue-8178
Fix DateTime comparison with DateTime::Infinity object
79a98d8
@floehopper floehopper Make tests for the presence of MiniTest consistent.
There is an inconsistency between the conditional logic in
the definition of ActiveSupport::TestCase and the conditional logic in
ActiveSupport::Testing::SetupAndTeardown [1].

In some circumstances, it's possible for MiniTest to be defined, but
for ActiveSupport::TestCase *not* to have MiniTest::Unit::TestCase or
MiniTest::Assertions in its ancestor chain. e.g. in Ruby 1.8 with the
minitest gem included in the bundle. In this case, the
Test::Unit/MiniTest shim/wrapper is not present and so
Test::Unit::TestCase (and therefore ActiveSupport::TestCase) is
completely independent of MiniTest::Unit::TestCase.

The conditional logic in the definition of ActiveSupport::TestCase does
not take this scenario into account, whereas the logic in
ActiveSupport::Testing::SetupAndTeardown does take it into account.

The changes in this commit are an alternative to the change in [2] which
was reverted in [3].

Similar conditional logic exists in ActiveSupport::Testing::Isolation
[4], ActiveSupport::Testing::Pending [5],
ActiveSupport::Testing::Performance [6], and in their respective tests.
I have not addressed these, because I know less about what's going on
there, but it would be worth bringing them all into line too.

[1]
https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/setup_and_teardown.rb#L13
[2]
c3e186e
[3]
267fb61
[4]
https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/isolation.rb#L41
[5]
https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/pending.rb#L14
[6]
https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/performance.rb#L17
48f9999
@rafaelfranca rafaelfranca Add regression test to #8907 fa0d434
@rafaelfranca rafaelfranca Fix the TestCase class and make tests pass on ruby 2.0 823604e
Commits on Jan 15, 2013
@carlosantoniodasilva carlosantoniodasilva Revert "Merge pull request #7983 from georgebrock/bug7950-squashed"
This reverts commit 88a296d, reversing
changes made to 666a7e3.

Conflicts:
	activerecord/CHANGELOG.md

Reason: this has been resulting in some hard to track bugs and is
introducing a possible breackage in a stable version.
da5e5c5
@carlosantoniodasilva carlosantoniodasilva Revert "Work around undiagnosed bug that's draining a relation's bind…
…_values"

This reverts commit 06cc38a.
cfa4c64
@carlosantoniodasilva carlosantoniodasilva Merge branch 'revert-binds-3-2' into 3-2-stable
This has been resulting in some hard to track bugs and is introducing
a possible breackage in a stable version. The issue it currently "fixes"
should be handled in some other way.

Closes #8743. Related to #7983.
63970dc
Commits on Jan 16, 2013
@rafaelfranca rafaelfranca Merge pull request #8914 from nilbus/fix-header-bloat
Remove header bloat introduced by BestStandardsSupport middleware
Conflicts:
	actionpack/CHANGELOG.md
9669aa7
@rafaelfranca rafaelfranca Merge pull request #8933 from freerange/3-2-stable-with-minitest-fix
Make tests for the presence of MiniTest consistent
fd990f2
@asanghi asanghi fixes #8631 local inflections from interfereing with HTTP_METHOD_LOOK…
…UP dispatch logic
5f3b40e
@pixeltrix pixeltrix Merge pull request #8632 from asanghi/3-2-stable
Fixes #8631 request post? detection should remain unaffected by local inflections such as POS for Point Of Sale
d3dcb4b
Commits on Jan 17, 2013
@josevalim josevalim Merge pull request #5288 from lest/patch-2
force response body to be read in assert_template
Conflicts:
	actionpack/lib/action_controller/test_case.rb
a5013bb
@carlosantoniodasilva carlosantoniodasilva Do not run this streaming test in Ruby 1.8, fix syntax error 626d0b1
@carlosantoniodasilva carlosantoniodasilva Remove warning of not used variable a3aca81
Commits on Jan 21, 2013
@pixeltrix pixeltrix Duplicate possible frozen string from route
Ruby 1.9 freezes Hash string keys by default so where a route is
defined like this:

get 'search' => 'search'

then the Mapper will derive the action from the key. This blows up
later when the action is added to the parameters hash and the
encoding is forced.

Closes #3429
4317596
Commits on Jan 22, 2013
@pixeltrix pixeltrix Add failing test case for #8460
Add a test case to ensure that fractional second updates are detected.
7ee7671
@pixeltrix pixeltrix Revert "Merge pull request #6986 from kennyj/fix_6975"
This reverts commit 8905c1f.

Closes #8460

Conflicts:
	activerecord/test/cases/dirty_test.rb
97a4db9
@fxn fxn Merge pull request #6197 from blakesmith/connection_adapters_without_…
…explain_support

Don't run explain on slow queries for database adapters that don't support it
29d564a
@carlosantoniodasilva carlosantoniodasilva Add changelog entry for skipping explain from dbs that don't support it
Backport of #6197 in 29d564a.
2a5d119
Commits on Jan 23, 2013
@elliterate elliterate Fix pluck when columns/tables are reserved words.
Backport #7536 to fix #8968.

Conflicts:

	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/calculations.rb
b6d4931
Commits on Jan 25, 2013
Damir Gaynetdinov Replaced abcs to config. 0b9c472
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9074 from gaynetdinov/replace_undefined_abcs_to_c…
…onfig_variable

Undefined abcs variable inside structure:dump task.
8422864
@rafaelfranca rafaelfranca Fix the CHANGELOG entry order [ci skip] ae28f06
Commits on Jan 26, 2013
@josevalim josevalim Install latest bundler on Travis.
Attempt to fix travis error on 1.8.7/1.9.2:

    $ bundle install --path vendor/bundle
    ERROR: Gem bundler is not installed, run `gem install bundler` first.

    The command "bundle install --path vendor/bundle" failed and exited
    with 127 during install.
c7d6cfb
Commits on Jan 29, 2013
@rosenfeld rosenfeld Add NumberHelper missing dependency
symbolize_keys depends on hash/keys AS core extension
56fd564
@rafaelfranca rafaelfranca Merge pull request #9113 from rosenfeld/patch-1
Add NumberHelper missing dependency
8593e0f
@rosenfeld rosenfeld Add another NumberHelper missing dependency
Another missing dependency, now affecting #number_to_percentage.

It depends on reverse_merge.
d82b5db
@rafaelfranca rafaelfranca Merge pull request #9114 from rosenfeld/patch-2
Add another NumberHelper missing dependency
1683afb
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9043 from senny/backport_7536
Backport: Fix pluck when columns/tables are reserved words.
1337e92
Commits on Feb 01, 2013
@steveklabnik steveklabnik Fix markdown syntax in actionpack CHANGELOG.
Starting a line with an octothorpe makes an <h1>
8f8ae5f
Commits on Feb 02, 2013
@rafaelfranca rafaelfranca Merge pull request #9078 from senny/6865_ar_count_with_uniq
`#count` in conjunction with `#uniq` performs distinct count.
Conflicts:
	activerecord/CHANGELOG.md
bf794bb
Commits on Feb 03, 2013
@drogus drogus Duplicate column_defaults properly
Backport c517602 to fix #6115

Deleted:
    activerecord/lib/active_record/core.rb

Conflicts:
    activerecord/test/cases/base_test.rb
6a0a5f3
@yahonda yahonda This pull requests addresses ORA-01400 errors and also supports #6115
…issue tested.

Issue #6115 has been fixed and tested with
the attribute `:null => false, :default => ""`
However `:null => false` attribute is not necessary to test this issue,
which causes many ORA-01400 errors with Oracle enhanced adapter.
e835793
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9159 from lexmag/col_defaults-dup-fix
Backport: Duplicate column_defaults properly
b4f189a
Commits on Feb 07, 2013
@dylanahsmith dylanahsmith active_record: Quote numeric values compared to string columns. 04c2d2e
Commits on Feb 08, 2013
@guilleiguaran guilleiguaran Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric
[3.2] active_record: Quote numeric values compared to string columns.
00e0b25
@dylanahsmith dylanahsmith Fix test failure for ruby 1.8.
BigDecimal.new needs to take a string rather than an integer in ruby 1.8.
cbdfaf2
@guilleiguaran guilleiguaran Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string
[3.2] Fix test failure for ruby 1.8.
54af52d
@spastorino spastorino Bump rack dependency to 1.4.5 697f31c
Commits on Feb 10, 2013
@tenderlove tenderlove fixing call to columns hash. run the damn tests when you backport! d29235d
@guilleiguaran guilleiguaran Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric
[3.2] active_record: Quote numeric values compared to string columns.
Conflicts:
	activerecord/CHANGELOG.md
921a296
@guilleiguaran guilleiguaran Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string
[3.2] Fix test failure for ruby 1.8.
b00fe01
@spastorino spastorino Bump rack dependency to 1.4.5
Conflicts:
	actionpack/actionpack.gemspec
638e247
@tenderlove tenderlove fixing call to columns hash. run the damn tests when you backport! 2f0ff75
@joernchen joernchen Fix issue with attr_protected where malformed input could circumvent
protection

Fixes: CVE-2013-0276
060bb72
@senny senny use .ruby-version instead of tool specifc config baeafb4
@guilleiguaran guilleiguaran Merge pull request #9239 from senny/use_ruby_version_on_3_2
ignore .ruby-version instead of tool specifc config on 3-2-stable
62f01be
Commits on Feb 11, 2013
@tenderlove tenderlove remove ruby-prof 9b9be48
@tenderlove tenderlove bumping version 1dccd44
@tenderlove tenderlove Merge branch '3-2-sec' into 3-2-stable
* 3-2-sec:
  bumping version
  remove ruby-prof
  Fix issue with attr_protected where malformed input could circumvent protection
  fixing call to columns hash. run the damn tests when you backport!
  Bump rack dependency to 1.4.5
  Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string
  Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric

Conflicts:
	Gemfile
	activerecord/CHANGELOG.md
f1efecf
Commits on Feb 12, 2013
@carlosantoniodasilva carlosantoniodasilva Update changelogs with version/release dates [ci skip] e0da95b
@carlosantoniodasilva carlosantoniodasilva Add note about attr_protected fix in Active Model changelog [ci skip] c0022f8
Commits on Feb 14, 2013
@matthewrobertson matthewrobertson backport of fix for issue #7630 18ffe50
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9278 from matthewrobertson/backport-hmt-counter-c…
…ache-bug

Backport of #8400 to fix for issue #7630, a bug in has_many :through counter caches.
d1904af
@jmccartie jmccartie Fixed changelog typos [ci skip] f15581b
@rafaelfranca rafaelfranca Merge pull request #9288 from jmccartie/jm/typos
Fixed changelog typos [ci skip]
b63eb67
@carlosantoniodasilva carlosantoniodasilva Fix typo in railties changelog [ci skip]
Other changelogs were fixed in f15581b.
4bb579a
@sikachu sikachu Add Ruby 2.0 RC to Travis CI build matrix 6996a04
@rafaelfranca rafaelfranca Merge pull request #9289 from rails/3-2-stable-test-with-ruby-2
Add Ruby 2.0 RC to Travis CI build matrix
ee3e3a9
@rafaelfranca rafaelfranca Merge pull request #9252 from senny/8423_hmt_preloading_bug
don't cache invalid subsets when preloading hmt associations
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/associations/eager_test.rb
c545177
@rafaelfranca rafaelfranca Fix the CHANGELOG headers [ci skip] b972035
@rafaelfranca rafaelfranca Do not put the version in unreleased changes [ci skip] de83b01
Commits on Feb 15, 2013
@rafaelfranca rafaelfranca Revert "Merge pull request #9252 from senny/8423_hmt_preloading_bug"
This reverts commit c545177.

Conflicts:
	activerecord/CHANGELOG.md
7f4975f
Commits on Feb 16, 2013
@joernchen joernchen Update activemodel/CHANGELOG.md
Fixed a typo
01b63c7
@fxn fxn Merge pull request #9308 from joernchen/patch-1
Update activemodel/CHANGELOG.md
f7c8457
Commits on Feb 17, 2013
@lilibethdlc lilibethdlc Fix handling of dirty time zone aware attributes
Previously, when `time_zone_aware_attributes` were enabled, after
changing a datetime or timestamp attribute and then changing it back
to the original value, `changed_attributes` still tracked the
attribute as changed. This caused `[attribute]_changed?` and
`changed?` methods to return true incorrectly.

Example:

    in_time_zone 'Paris' do
      order = Order.new
      original_time = Time.local(2012, 10, 10)
      order.shipped_at = original_time
      order.save
      order.changed? # => false

      # changing value
      order.shipped_at = Time.local(2013, 1, 1)
      order.changed? # => true

      # reverting to original value
      order.shipped_at = original_time
      order.changed? # => false, used to return true
    end

(cherry picked from commit bc982cb)

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb

Backport of #9073
Fixes #8898
3c5f631
Commits on Feb 18, 2013
@rafaelfranca rafaelfranca Allow failures to 2.0.0 46b65ba
Commits on Feb 19, 2013
@senny senny don't cache invalid subsets when preloading hmt associations.
Backport #9252.

Conflicts:

	activerecord/CHANGELOG.md
	activerecord/test/cases/associations/eager_test.rb

The preloader code on 3-2-stable is not based on relations but on option hashes.
I had to modify the original patch and comparing the option hashes could be more
fuzzy than comparing the relations. All the tests passed though.
587f563
@rafaelfranca rafaelfranca Merge pull request #9322 from senny/backport_9252
don't cache invalid subsets when preloading hmt associations.
b4e053e
@senny senny keep the build :green_heart:, #first on 1.8.7 and pg is different
The build only failed for ruby-1.8.7 and pg. The problem was that the statement:

```ruby
author = Author.includes(:comments_with_order_and_conditions, :posts).first
```

resulted in Author with ID 2 where on all other rubies / db-engines Author with ID 1
was retunred. Of course this breaks the assertions.
9be7f63
@rafaelfranca rafaelfranca Merge pull request #9323 from senny/build_fix_from_9252
keep the build :green_heart:, #first on 1.8.7 and pg is different
3143620
Commits on Feb 21, 2013
@rafaelfranca rafaelfranca Use order to get the first record since postgresql returns in the
desired order
a0d8422
@carlosantoniodasilva carlosantoniodasilva Change tabs to spaces in form options helper [ci skip] fdcd7c0
Commits on Feb 22, 2013
@senny senny determine the match shorthand target early.
Backport #9361.
Closes #7554.

This patch determines the `controller#action` directly
in the `match` method when the shorthand syntax is used.
this prevents problems with namespaces and scopes.
a72dab0
@pixeltrix pixeltrix Merge pull request #9374 from senny/improved_match_shorthand_syntax
determine the match shorthand target early.
e55b0f6
@carlosantoniodasilva carlosantoniodasilva Use 1.8 hash style 0c1558d
Commits on Feb 23, 2013
@senny senny Sqlite preserves primary keys when copying/altering tables.
Backport #2312.
Fixes #9367.

I also added a test-case to make sure that renaming or removing
a column preserves the primary key.
8f6fa34
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9388 from senny/9367_wrong_schema_after_remove_co…
…lumn

Sqlite preserves primary keys when copying/altering tables.
2647a3c
Commits on Feb 24, 2013
@sikachu sikachu Add in missing requires fe4fce8
@tenderlove tenderlove `name` should be public. 9a0cdc6
@sikachu sikachu Fix failing test case when no database.yml b59b72a
@sikachu sikachu Define #inspect instead of #to_s
Ruby 2.0 Object#inspect does not call #to_s by default anymore.
45e9cac
@tenderlove tenderlove search private and protected methods for convert_key 7cc26fd
@tenderlove tenderlove Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifical…
…ly tag this file with us-ascii
2a5f6d8
@jeremy jeremy Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrop…
…hes a few times, so fix up the test to work with however it chooses to escape.
42d7927
@thedarkone thedarkone There is already a Set of non-hidden action_names lying around. abf0c71
@sikachu sikachu Check for `method_missing` in public and protected
Ruby 2.0 changed the behavior of `respond_to?` without argument to
return only search for public method. We actually want to perform the
action only if `method_missing` is either in public or protected.
979e198
@rafaelfranca rafaelfranca Make the tests pass with minitest 4.2 0190dca
@jeremy jeremy Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring…
… them. No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add9
5693d44
@sikachu sikachu Do not redirect cache logger to /dev/null in test
For some reason, redirecting cache's logger to '/dev/null' resulting in
a test failures and LoadError. I think it's because of Thread issue.
Instead of trying to make every logger threadsafe for Rails 3.2, I think
it's better to just don't set the logger for now.

(Note: resetting the logger back to original value in the teardown block
didn't fix the problem.)
8598633
@hsbt hsbt added marshal_load and marshal_dump for ProxyTestResult. Behavior of …
…method_missing with Marshal.dump and Marshal.load is changing in ruby 2.0.0 later.
621b5b7
@sikachu sikachu Rails 3.2.x is now compatible with Ruby 2.0.0 2a12a04
@rafaelfranca rafaelfranca Merge pull request #9406 from rails/3-2-stable-ruby-2
Rails 3.2.x is now compatible with Ruby 2.0.0
e9d6592
Commits on Feb 25, 2013
@mikeycgto mikeycgto Update RUBY_VERSION check for performance testing to handle 2.0.0 6df2db3
@rafaelfranca rafaelfranca Merge pull request #9408 from mikeycgto/origin/3-2-stable
Update RUBY_VERSION check for performance testing to handle 2.0.0
0761bb0
Commits on Feb 26, 2013
@authorNari authorNari Backported #7072 to 3-2-stable. Use database value for uniqueness val…
…idation scope.
905b7df
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9430 from authorNari/backport-7072-to-3-2-stable
Backported #7072 to 3-2-stable. Use database value for uniqueness validation scope
06eb872
@carlosantoniodasilva carlosantoniodasilva Improve changelog entry [ci skip] c90e24d
@yaotti yaotti Do not override attributes on `dup` by default scopes 55a1765
Commits on Feb 27, 2013
@steveklabnik steveklabnik Revert "Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-nu…
…meric"

This reverts commit 921a296.
ee291b9
@steveklabnik steveklabnik CHANGELOG entry for ee291b9.
Since we released it, it should go in the CHANGELOG.
1a88523
@steveklabnik steveklabnik Tighten up AS.gemspec.
Apparently 0.6.2 has a call to force_encoding, which is not around
in 1.8.7.
197b9f4
@steveklabnik steveklabnik Update CHANGELOGs for 3.2.13 release. 23434f6
@steveklabnik steveklabnik Preparing for 3.2.13.rc1 release 5ca59b0
Commits on Mar 05, 2013
@spastorino spastorino Freeze columns only once per Result
Conflicts:
	activerecord/lib/active_record/result.rb
b544524
@tenderlove tenderlove Revert "Merge pull request #8209 from senny/backport_8176"
This reverts commit 7240202, reversing
changes made to e4e2bcc.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/calculations.rb
	activerecord/test/cases/calculations_test.rb
1b699fc
Commits on Mar 06, 2013
@tenderlove tenderlove bumping to rc2 ccf256d
Commits on Mar 12, 2013
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9616 from exviva/multiple_select_name_double_squa…
…re_brackets

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
4886991
Commits on Mar 16, 2013
@tenderlove tenderlove stop calling to_sym when building arel nodes [CVE-2013-1854] f980289
@charliesome charliesome fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] ff3b9ca
@benmmurphy benmmurphy JDOM XXE Protection [CVE-2013-1856]
Conflicts:
	activesupport/test/xml_mini/jdom_engine_test.rb
c0d0663
@tenderlove tenderlove fix protocol checking in sanitization [CVE-2013-1857]
Conflicts:
	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
99123ad
Commits on Mar 18, 2013
@tenderlove tenderlove bumping to 3.2.13 a4b5582