Skip to content
This repository
  • 10,000 commits
  • 233 files changed
  • 23 comments
  • 63 contributors
This comparison is big! We're only showing the most recent 250 commits
Mar 05, 2013
Carlos Antonio da Silva Merge pull request #9543 from maximerety/backport_fix_7774
Backported #7774 to 3-2-stable
0df9647
Santiago Pastorino Freeze columns only once per Result
Conflicts:
	activerecord/lib/active_record/result.rb
b544524
Steve Klabnik Update CHANGELOGs for 3.2.13.rc1 51ae6f4
Aaron Patterson 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
Mar 06, 2013
Aaron Patterson bumping to rc2 ccf256d
Mar 07, 2013
Yasuo Honda Use shorter prefix and suffix as in Oracle database identifier
cannot be larger than 30 characters
5d57b82
Rafael Mendonça França Merge pull request #9594 from yahonda/3-2-stable_prefix_suffix
Use shorter prefix and suffix to support Oracle adapter
bb0007f
Rafael Mendonça França Merge pull request #9549 from larrylv/reload-stable-target-before-saving
Fix issue #7526. Reload the association target if it's stale.
9bd5c86
Rafael Mendonça França Merge pull request #9600 from larrylv/fix-load-target-with-identity-m…
…ap-on


@target might be nil when Identity Map is enabled.
075d0e2
Mar 08, 2013
Larry Lv @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.
f01f03e
Arun Agrawal Using latest AR-JDBC for JRuby
1.2.5 and 1.2.6 are bad ones
3033dbe
Carlos Antonio da Silva Merge pull request #9609 from arunagw/using-latest-arjdbc
Using latest AR-JDBC for JRuby
8f5c750
Arun Agrawal Removing FIXME
As we did in master.
c8918c6
Carlos Antonio da Silva Merge pull request #9613 from arunagw/remove_fixme
Removing FIXME
348d693
Mar 09, 2013
Carlos Antonio da Silva 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
a0c3c1e
Mar 12, 2013
Carlos Antonio da Silva 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
Mar 13, 2013
Andrew White Fix `ActiveSupport::TimeZone.parse` when time is a local DST jump
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:
005d910
c89b6c4
03becb1

Fixes #9678.
ba910d7
Andrew White Fix ar:mysql2 build on Ruby 1.8.7
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.
3d4d742
Mar 14, 2013
Juan Manuel Barreneche Extract hardcoded lists to Redo::RestaurantsList ce75569
Steve Klabnik Merge pull request #7368 from jbarreneche/bug/render-locale-fallbacks
i18n locale fallback for localized views
9d5699a
Mar 15, 2013
justin Typo fix [ci ski]
Closes #9730.
1c2717d
Aaron Patterson stop calling to_sym when building arel nodes [CVE-2013-1854] f980289
Charlie Somerville fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] ff3b9ca
benmmurphy JDOM XXE Protection [CVE-2013-1856]
Conflicts:
	activesupport/test/xml_mini/jdom_engine_test.rb
c0d0663
Aaron Patterson fix protocol checking in sanitization [CVE-2013-1857]
Conflicts:
	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
99123ad
Mar 18, 2013
Yves Senn do not freeze NumberHelper defaults.
Closes #9767.
f662a74
Carlos Antonio da Silva Merge pull request #9768 from senny/do_not_freeze_number_helper_defaults
Do not freeze NumberHelper defaults
491d691
Aaron Patterson bumping to 3.2.13 a4b5582
Aaron Patterson Merge branch '3-2-13' into 3-2-stable
* 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
afcd01b
Carlos Antonio da Silva Fix changelog conflicts and remove release dates [ci skip] a8e7a00
Carlos Antonio da Silva Fix method name indent [ci skip] 9194221
Carlos Antonio da Silva Bring back test and changelog entry from #pluck method and select clause 167b645
Claudio B. Add release dates to documentation [ci skip]
Set "March 18, 2013" as the release date for 3.2.13
0e56c1d
Rafael Mendonça França Merge pull request #9785 from claudiob/add-3-2-13-release-date-to-cha…
…ngelogs

Add release dates to documentation [ci skip]
ef5faeb
Evan Phoenix Change @env_config to @app_env_config
Moral of the story: One must be careful about lazily initializing
instance variables when subclassing.

I would like to draw your attention to #4652 where
the reader will see that there appears to be some kind of initialization issue
in rails.

The source of this issue is that:
1) Engine#env_config contains "@env_config ||= ..."
2) Application#env_config contains "@env_config ||= ..."
3) Threads are in the picture
4) Thread A calls Application#env_config, which super's to Engine#env_config
5) After Engine#env_config returns but before Application#env_config sets @env_config again, Thread B begins running
6) Thread B calls Application#env_config
7) Thread B finds @env_config to contain a value (the one set by Engine#env_config) and returns it
8) Thread B blows up because key set by Application#env_config are there.
9) People report bugs with puma, thin, rainbows, webrick, etc
10) Evan becomes tired of seeing these bugs
11) Evan pours himself a stiff drink, puts on Top Gear(tm), and begins debugging
12) Evan finds the source of the bug
13) Evan authors a PR
14) RIGHT NOW.

The bug is fixed by simply using a different ivar name in the methods.
Alternately, Engine#env_config could just return a new Hash each time, not memoizing into @env_config.

I bid you adieu.
8aadc6f
José Valim Merge pull request #9789 from puma/3-2-stable
Change @env_config to @app_env_config
2cf38ae
Mar 19, 2013
Michael Hoffman Backport #9347 to rails 3.2 1b12d08
Rafael Mendonça França Merge pull request #9804 from samsonasu/backport_number_to_human_fixes
Backport #9347 to rails 3.2
493c10e
Dembskiy Alexander Reset postgreSQL search path in db:test:clone_structure.
This patch resets the postgres search path in the structure.sql after
the structure is dumped in order to find schema_migrations table when
multiples schemas are used.

Fixes #945
ca6a12d
Rafael Mendonça França Merge pull request #9796 from dembskoi/clone_structure
Reset postgreSQL search path in db:test:clone_structure.
2011cc6
Carlos Antonio da Silva Be consistent with quotes in smtp example guide [ci skip] 517060a
Mar 20, 2013
Fred Wu Fixed assets loading performance in 3.2.13
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
687e68d
Don't crash exception translation w/ nil result attribute.
Exception.result is nil when attempting a query after PostgreSQL
disconnect, resulting in new exception:
NoMethodError: undefined method `error_field' for nil:NilClass
be913c3
Toshinori Kajihara Wrong exception is occured when raising no translatable exception
Conflicts:
	activerecord/CHANGELOG.md
dc2bc38
Carlos Antonio da Silva Remove bad changelog entry from AR [ci skip]
Introduced in dc2bc38.
7e8a74d
Rafael Mendonça França Merge pull request #9802 from newsline/fix-broken-action-missing
Fix missing action_missing

Conflicts:
	actionpack/CHANGELOG.md

Conflicts:
	actionpack/test/controller/base_test.rb

Fixes #9799
2c8f349
Aaron Patterson Merge branch '3-2-stable' into fredwu-slow_view_loading_fix
* 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
d1577cf
Mar 21, 2013
Fred Wu Added changelog for 687e68d 38d0647
Rafael Mendonça França Improve CHANGELOG entry [ci skip] afe5880
Rafael Mendonça França Fix test to Ruby 1.8
Pathname doesn't respond to to_path
69599b6
Mar 22, 2013
Yves Senn do not reset associations when preloading twice.
Closes #9806.

As the `through_options` always contained `{:order=>nil}` the second time,
the preloader ran, the association was always reset. This patch only
adds the `:order` to the `through_options` if it is set.
c8edd4f
Jon Leighton Merge pull request #9870 from senny/9806_eager_loading_regression
do not reset associations when preloading twice.
ae2baab
Yves Senn use ruby 1.8 Hash syntax [ci skip] 845cc5c
Jon Leighton Merge pull request #9873 from senny/use_old_hash_syntax
use ruby 1.8 Hash syntax [ci skip]
029dd43
Mar 24, 2013
Jon Rowe test case to assert that associations do not overwrite after create, …
…fixes #9310
0c96169
Mack Earnhardt Backport #5808
df36c5f - Fix assert_template assertion with :layout option
4bd05a7 - Fix assert_template :layout => nil assertion
0d19a08 - Improve assert_template layout checking
74e59ea
Jeremy Kemper Merge pull request #9899 from macksmind/backport_5808
Backport #5808
dbd26e9
Mar 26, 2013
Rafael Mendonça França Merge pull request #9576 from fredwu/backport_fix_explicitly_inherait…
…ance_column_to_3_2_stable

[Backport to 3-2-stable] Don't reset inheritance_column when setting explicitly.
df37c91
Carlos Antonio da Silva Merge pull request #9943 from fredwu/test_fix_for_74e59ea
Fixed test failures on 1.8.7 caused by 74e59ea
75d0a81
Mar 27, 2013
Fred Wu Don't reset inheritance_column when setting explicitly.
This is backported from master (cdfcbc4).
55e2954
Fred Wu Added changelog for 55e2954 8bd56f0
Fred Wu Fixed test failures on 1.8.7 caused by 74e59ea dee5915
Mar 28, 2013
Rafael Mendonça França Removing explain support warning from the Railtie
This is causing a regression since the Active Record Railtie is trying to
connect to the development database in the application boot.

See #6197 (comment)
e06b4fa
Mar 29, 2013
Steve Klabnik Add attr_accessible to the Getting Started Guide.
This was brought up in #9995, but is only present in 3-2-stable, since
mass assignment is removed from Rails 4.
bac6928
Mar 30, 2013
Carlos Antonio da Silva Fix formatting and minor review in AP changelog
Sentences starting with # are considered headings.
060fca7
Apr 02, 2013
Dmitry Vorotilin Common behavior with adding formats to lookup_context for TemplateRen…
…derer and PartialRenderer
2c22376
Apr 03, 2013
Chris Geihsler Chained scopes will be preloaded properly. Fixes #7490 453c7d6
Carlos Antonio da Silva Merge pull request #7792 from seejee/chained_scopes_preload_properly
Fixes Issue #7490: Chained scopes will preload properly
e59f380
Carlos Antonio da Silva Use 1.8 hash style in test views
Introduced in 2c22376
e252e0f
Carlos Antonio da Silva Fix typo in view name
Introduced in 2c22376
fe58853
Apr 05, 2013
Ryan McGeary Fix explicit names on multiple file fields
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
44a9aed
Rafael Mendonça França Merge pull request #10105 from rmm5t/fix-explicit-name-on-multiple-fi…
…elds

Fix explicit names on multiple file fields
dbe2591
Rafael Mendonça França Improve the changelog entry [ci skip] c9bd202
Apr 09, 2013
Aaron Patterson Merge branch '3-2-later' into 3-2-stable
* 3-2-later:
  adding test for CVE
536f316
Apr 11, 2013
Erik Peterson Correctly parse bigint defaults in PostgreSQL, Backpost #10098.
Conflicts:

	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
	activerecord/test/cases/schema_dumper_test.rb
a6d9e16
Rafael Mendonça França Merge pull request #10172 from senny/10098_backport
Backport: Correctly parse bigint defaults in PostgreSQL
6823948
Apr 13, 2013
Alexey Muranov Document nested attributes as hash of hashes
Document the possibility to use a hash of hashes for nested attributes for a one-to-many association (in addition to the documented possibility to use an array of hashes).

Align indentation in comments.
efd8631
Carlos Antonio da Silva Merge pull request #9688 from alexeymuranov/doc-nested-attributes-3-2
3-2-stable documentation: the possibility to use a hash of hashes for nested attributes
130f96c
Apr 16, 2013
Carlos Antonio da Silva Fix "Scaling Rails Screencasts" link in caching guide
Closes #10241 [ci skip]
624428b
Apr 17, 2013
प्रथमेश Use secure source in generated Gemfile for creating new plugin. Closes cd548d9
Carlos Antonio da Silva Merge pull request #10246 from prathamesh-sonpatki/3.2.13-https-rubygems
Using secure source https://rubygems.org when generating new plugin with Rails 3.2
dddc093
Aaron Patterson adding a test for root path in the app 03d071d
Aaron Patterson just clear the caches on clear! rather than replacing. fixes #10251 ba12ef6
Apr 26, 2013
Aaron Patterson adding test for the symbol refs 9d7a748
Apr 29, 2013
Janko Marohnić Fix ActiveRecord::Store not tracking changes 5519468
May 04, 2013
Rafael Mendonça França Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-master
Fixes Scaffold generator with --assets=false
Conflicts:
	railties/CHANGELOG.md

Conflicts:
	railties/CHANGELOG.md
	railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
927a04d
May 05, 2013
Carlos Antonio da Silva Merge pull request #10466 from prathamesh-sonpatki/scaffold-assets
Fix tests related to scaffolding generator with --assets=false switch
3c01a69
May 06, 2013
Ben Tucker Merging in fix from #8222 5a6d9d5
Rafael Mendonça França Merge pull request #10406 from greenriver/distance_of_time_rational
Correct time_ago_in_words to handle situation where Fixnum#/ returns a Rational (thanks to mathn)
fb90ce0
Rafael Mendonça França Merge pull request #10478 from cainlevy/patch-1
use canonical #controller_path logic in controller test cases
Conflicts:
	actionpack/lib/action_controller/test_case.rb
0b35a3a
Rafael Mendonça França Merge pull request #10489 from greenriver/ar_counter_cache_multiple_d…
…estroy

Confirm a record has not already been destroyed before decrementing counter cache

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/associations/builder/belongs_to.rb
f8c4a31
May 07, 2013
Arun Agrawal Build fix for scaffold generator
3-2 behaves different when scaffolding.
8407ab1
Carlos Antonio da Silva Merge pull request #10496 from arunagw/build-fix-scaffold-generator
Build fix for scaffold generator
8218a46
May 08, 2013
Rafael Mendonça França Revert "Remove unicode character encoding from ActiveSupport::JSON.en…
…code"

This reverts commit 815a943.

Conflicts:
	activesupport/test/json/encoding_test.rb

Reason: This was causing a regression where the resulting string is always
returning UTF-8. Also it changes the behavior of this method on a stable release.

Fixes #9498.
c910388
Rafael Mendonça França 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

Reason: This caused a regression since it changed the behavior in a
stable release.

Fixes #9777
84c69a1
May 10, 2013
Arun Agrawal Remove useless else 6ab3c73
Arun Agrawal Fixed pluck to be working with selects.
See #9777 for details.

Previously pluck is not returning what we wanted to
Added a test also to make sure it's working fine.
 
This will also fix the build for 1.8.7 as we 
were doing some sort on hash.

Thanks @pixeltrix for helping me out.

Thanks @linduxed for pairing with me.
de5b89d
Rafael Mendonça França Merge pull request #10552 from arunagw/pluck-fixed-3-2-stable
Pluck fixed 3 2 stable
3589181
Daniel Schierbeck Don't try to EXPLAIN select_db calls a33d320
Xavier Noria Merge pull request #10555 from dasch/dasch/3-2-stable
Don't try to EXPLAIN select_db calls
4fa8607
Arun Agrawal Using map. No need to run query again afedb09
Andrew White Merge pull request #10557 from arunagw/pluck-refactor-using-map
Using map. No need to run query again
a711193
Rafael Mendonça França Fix test to ruby 2.0
The default enconding changed on Ruby 2.0
a59d661
Rafael Mendonça França So not make Fixnum#/ private on Ruby verions less than 1.9.3
In those version to_date call Fixnum#/, what will cause a failure
0be27b7
May 11, 2013
Xavier Noria Revert "Don't try to EXPLAIN select_db calls"
Reason: This was backported, but the test does not pass as is.

This reverts commit a33d320.
0549ebe
Rafael Mendonça França Add CHANGELOG entry removed by mistake [ci skip] e2804c6
Rafael Mendonça França Merge pull request #10571 from dasch/dasch/restore-explain-fix
Don't try to EXPLAIN select_db calls
5c6cf4e
Andrew Horner Preserve context for joins while merging relations
This is a backport of #10164, already merged into
master. The issue is described in lengthy detail
in issues #3002 and #5494.
c09829e
Rafael Mendonça França Merge pull request #10303 from ahorner/3-2-stable
Preserve context for joins while merging relations
5919a55
May 12, 2013
Daniel Schierbeck Don't try to EXPLAIN select_db calls
Now with a non-broken test.
ddaa5d5
Rafael Mendonça França Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0
backport runner fixes to 3-2-stable

Conflicts:
	railties/CHANGELOG.md
442b7c8
Rafael Mendonça França Improve CHANGELOG entries
[ci skip]
b1fb8ef
May 14, 2013
Mikel Lindsaar Update mail to minimum version 2.5.4 010ea71
Ben Woosley Backport a super-simplified version of #6792, fixing
that #exists? and others can produce invalid SQL: "SELECT DISTINCT DISTINCT"

The combination of a :uniq => true association and the #distinct call
in #construct_limited_ids_condition combine to create invalid SQL, because
we're explicitly selecting DISTINCT, and also sending #distinct on to AREL,
via the relation#distinct_value.

Where #6792 was the forever fix, this is the minimal fix. Instead of
properly indicating the distinctness of the query through #uniq_value alone,
we use a literal select statement and set #uniq_value to always be falsey
23c656c
Rafael Mendonça França Merge pull request #10616 from Empact/backport-distinct-distinct
Backport a super-simplified version of #6792, fixing that #exists? can produce invalid SQL: "SELECT DISTINCT DISTINCT"
5b020fa
May 15, 2013
Xinjiang Lu Support include_root_in_json for ActiveResource properly.
This commit is a backport from
rails/activeresource#29. The
ActiveResource's include_root_in_json option is broken for 3.2.x.
ec55866
Rafael Mendonça França Merge pull request #10578 from dingle/lu/back_port_to_json_fix
Support include_root_in_json for ActiveResource properly.
0d8dbd1
May 18, 2013
Johnny Holton destroys association records before saving/inserting new association …
…records

This is a backport of #10417

fixes bug introduced by  #3329
These are the conditions necessary to reproduce the bug:
- For an association, autosave => true.
- An association record is being destroyed
- A new association record is being created.
- There is a unique index one of the association's fields.
- The record being created has the same value as the record being
destroyed on the indexed field.

Before, the deletion of records was postponed until after all
insertions/saves.  Therefore the new record with the identical value in
the indexed field caused a non-unique value error to be thrown at the
database
level.

With this fix, the deletions happen first, before the insertions/saves.
Therefore the record with the duplicate value is gone from the database
before the new record is created, thereby avoiding the non-uniuqe value
error.
c236246
May 20, 2013
Rafael Mendonça França Merge pull request #10646 from kennyj/fix_am_20130517
Fix ActionMailer testcase break with mail 2.5.4.
Conflicts:
	actionmailer/CHANGELOG.md
	actionmailer/test/mailers/base_mailer.rb
b0f96d4
May 22, 2013
Rafael Mendonça França Merge pull request #10681 from jholton/3-2-stable-fix_association_aut…
…o_save

autosave_association issue that occurs when table has unique index (3.2.x backport)
f8c4805
May 23, 2013
Rafael Mendonça França Merge pull request #10713 from senny/10693_fix_primary_key_option_on_…
…has_many

Fix the `:primary_key` option for `has_many` associations.
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/associations/has_many_association.rb
d293990
May 24, 2013
Arun Agrawal Using 1.8.7 syntax for 3-2-stable b75c8e5
Arun Agrawal It's scoped in 3-2-stable!
scope => scoped
0e14973
Andrew White Merge pull request #10745 from arunagw/build_fix_ruby187
Build fix ruby187
7101a85
Andrew White Restore rescue block for when IM is enabled 8799cfa
Jun 05, 2013
Aaron Patterson adding a test for #10830 20daaf4
Jun 08, 2013
Andrew White Override Time.at to work with Time-like values
Time.at allows passing a single Time argument which is then converted
to an integer. The conversion code since 1.9.3r429 explicitly checks
for an instance of Time so we need to override it to allow DateTime
and ActiveSupport::TimeWithZone values.
f42e0fd
Jun 15, 2013
Yves Senn Merge pull request #10925 from senny/10917_test_to_prevent_regression
regression test + mysql2 adapter raises correct error if conn is closed.
Conflicts:

	activerecord/CHANGELOG.md
a51d4e6
Rafael Mendonça França nokogiri >= 1.6 doesn't work with ruby 1.8 7092467
Jun 16, 2013
Rafael Mendonça França Compare host scheme using case-insensitive regexp
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
9f754e8
Jun 19, 2013
Matthieu Paret indicate the default Rails cache store
memory_store is the default cache store implementation if you call
ActiveSupport::Cache.lookup_store without arguments.
31899da
Yves Senn Merge pull request #10883 from ifeelgoods/3-2-stable
The default cache store is :file_store in caching_with_rails.textile
b768647
Jun 20, 2013
Robin Dupret Update the feedback instructions [ci skip]
Since docrails as moved from lifo/docrails to rails/docrails we have
to ask for commit rights or submit patches directly to the rails
repository
f3b84e2
Xavier Noria Merge pull request #11033 from robin850/patch-1
Update the feedback instructions
919d1a1
Jun 21, 2013
Jared Armstrong Fixes CollectionAssociation#ids_reader returning incorrect ids for ne…
…w records
c2377f7
Jun 22, 2013
Yves Senn Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_…
…on_new_record_collection_ids_reader

Fixes CollectionAssociation#ids_reader returning incorrect ids for new records
6675d71
Yves Senn Revert "Merge pull request #10901 from armstrjare/fix_query_null_fore…
…ign_key_on_new_record_collection_ids_reader"

This reverts commit 6675d71, reversing
changes made to 919d1a1.

I missed to check the target branch and wrongly merged it into 3-2-stable directly.
5009b07
Jun 24, 2013
Rafael Mendonça França Fix textile markup
Closes #11076

[ci skip]
119f27c
Rafael Mendonça França Merge pull request #10971 from dtaniwaki/escape_link_to_unless
Always escape the result of link_to_unless method
2553bd7
Rafael Mendonça França Add CHANGELOG entry for #10971
[ci skip]
ca23e6d
Jun 25, 2013
Andrew White Fix shorthand routes where controller and action are in the scope
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
622e4ab
Andrew White Use old style hash syntax for 3-2-stable b0c6597
Yves Senn Revert "Revert "Merge pull request #10901 from armstrjare/fix_query_n…
…ull_foreign_key_on_new_record_collection_ids_reader""

This reverts commit 5009b07.

Also updated the CHANGELOG and adjusted the test-case to match the one on master.
27b3883
Carlos Antonio da Silva Merge pull request #10373 from janko-m/fix-store-accessor
Fix a bug in ActiveRecord::Store accessors
07c6262
Carlos Antonio da Silva Move changelog entry to the top [ci skip] cde6ead
Yves Senn Merge pull request #9893 from JonRowe/add_test_to_assert_association_…
…doesnt_overwrite

Add a test to assert autosaving associations doesn't overwrite id accessor methods
b23e0d6
Yves Senn Merge pull request #11019 from tkhr/test_case_for_issue_10393
Add test case for issue #10393 and fix warning message
63d4894
Jun 26, 2013
chapmajs Allow global override of default STI inheritance column
This change fixes a bug by which 3.2-STABLE users can't globally override the default STI inheritance column with `ActiveRecord::Base.inheritance_column = 'some_column'`. 3.2-STABLE users are forced to use a deprecated method or monkey patch it otherwise.

Test case written by tkhr <takehiro0740@gmail.com>.
839efc5
Yves Senn build fix, fall back to old hash syntax cacfa8e
Jun 27, 2013
Yves Senn Backport rails/rails-perftest#2 to fix rake test:benchmark 1db54d7
Yves Senn clear ARGV to prevent mintest autorun errors:
Minitest expects the first argument in `ARGV` to be the path to a test file.
Because `rails benchmarker` and `rails profiler` define an on-the-fly test-case,
using the first `ARGV` to pass the code to execute this results in:

```
/Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:167:in `block in non_options': file not found: 1000.times{"a string"} (ArgumentError)
	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:146:in `map!'
	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:146:in `non_options'
	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:207:in `non_options'
	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:52:in `process_args'
	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/minitest/unit.rb:891:in `_run'
	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/minitest/unit.rb:884:in `run'
	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:21:in `run'
	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:326:in `block (2 levels) in autorun'
	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:27:in `run_once'
	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:325:in `block in autorun'
```

clearing ARGV after defining the test-case solves this issue.
b47f8d0
Yves Senn Merge pull request #9173 from senny/backport_perftest_fix
Backport rails/rails-perftest#2 to fix rake test:benchmark
0a55bd7
Yves Senn unify duplicate CHANGELOG entry 9a8f593
Jul 01, 2013
Carson Reinke Incorrectly providing program name the same as log message even when …
…block is not provided.
4265f1b
Rafael Mendonça França Merge pull request #8881 from carsonreinke/3-2-stable
3-2-stable ActiveSupport::TaggedLogging logging progname issue
b977181
Jul 02, 2013
Santiago Pastorino Add missing require e359e3a
Jul 06, 2013
Rafael Mendonça França Skip connection url test when the machine is using socket configuration.
The connection url parssing don't accept the socket option
29106ce
Rafael Mendonça França Remove warning of assigned but unused variable a72a0eb
Rafael Mendonça França New changelog entries always on the top [ci skip] b5830d1
Jul 08, 2013
Rafael Mendonça França Add license to the gemspec 2ce875d
Rafael Mendonça França Remove git dependecy c4ad10e
Jul 09, 2013
Rafael Mendonça França Do not shallow the original exception in exec_cache
when result_error_field is not defined on result raise the original
exception.

Fixes #11260
d704c1c
Andrew White Retain offset and fraction when using Time.at_with_coercion
The standard Ruby behavior for Time.at is to return the same type of
time when passing an instance of Time as a single argument. Since the
an ActiveSupport::TimeWithZone instance may be a different timezone than
the system timezone and DateTime just understands offsets the best we
can do is to return an instance of Time with the correct offset.

It also maintains the correct fractional second value as well.

Fixes #11350.

Backports:
4842535
1b38737
ccad803
Andrew White Return local time for backwards compatibility b775987
Jul 10, 2013
Andrew White Add missing require so that DateTime has the right superclass
If the DateTime core extensions were loaded before the Date core extensions
then you would get a superclass mismatch as DateTime hasn't been defined
yet so it gets set to Object by the acts_like core extension.

Fixes #11206

(cherry picked from commit 78f7d5b)
714cb5a
Jul 12, 2013
Rafael Mendonça França Preparing for 3.2.14.rc1 release facfc24
Jul 15, 2013
Yves Senn Merge pull request #11451 from jetthoughts/11450_do_not_resave_destro…
…yed_association

Do not re-save destroyed association on saving parent object
Conflicts:
	activerecord/lib/active_record/autosave_association.rb
2ae2728
Yves Senn Merge pull request #11451 from jetthoughts/11450_do_not_resave_destro…
…yed_association

Do not re-save destroyed association on saving parent object
Conflicts:
	activerecord/lib/active_record/autosave_association.rb

Conflicts:
	activerecord/CHANGELOG.md
1c2545a
Rafael Mendonça França Use Ruby 1.8 syntax 66cba60
Rafael Mendonça França Use Ruby 1.8 syntax 1900a56
Jul 16, 2013
Rafael Mendonça França Preparing for 3.2.14.rc2 release a96df04
Jul 17, 2013
Arun Agrawal Removed unused test file
This test file is not be running from a long time
This test is already covered in controller/caching_test.rb
fc0faaa
Carlos Antonio da Silva Merge pull request #11468 from arunagw/removed_unsed_test
Removed unused test file
ac5cc69
Wolfram Arnold Add respond_to_missing? for TaggedLogging which is needed if another …
…log abstracter wraps a TaggedLogging instance.

It's also best practice when overriding method_missing.
803008e
Rafael Mendonça França Merge pull request #10800 from 907th/fix-custom-message-for-assert_re…
…directed_to

Fix #10842. `assert_redirected_to` does not show user-supplied message.
39441f7
Jul 18, 2013
Alexey Chernenkov Fix `assert_redirected_to` does not show user-supplied message.
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.
0f5ba6e
Rafael Mendonça França Merge pull request #11486 from wolframarnold/3-2-stable_fix_respond_t…
…o_missing_in_tagged_loggging

3-2-stable patch: Add respond_to_missing? in TaggedLoggging
ed19c02
Jul 21, 2013
Andrew White Add test to prevent route reloading regression
Journey doesn't clear its named route hash when the routes are reloaded but
Rails 3.2 isn't affected because Journey overwrites the existing route. This
is just a backport of the test to make sure it doesn't become affected in
some future release.
d835307
Jul 22, 2013
Rafael Mendonça França Update CHANGELOG entry 47fb44f
Rafael Mendonça França Preparing for 3.2.14 release 2fcd13e
Rafael Mendonça França Fix activemodel CHANGELOG c69ccea
Rafael Mendonça França Merge branch '3-2-14' into 3-2-stable 2b3ce86
Rafael Mendonça França Fix actionpack CHANGELOG entry
It was included by git on the wrong release
e0db277
Jul 23, 2013
90yukke Fix merge error when Equality LHS is non-attribute.
This is reworking of rails/rails#7380 made for rails 3.
b289519
Rafael Mendonça França Merge pull request #11563 from 90yukke/fix-nomethoderror-on-non-attri…
…bute-equalities

Fix merge error when Equality LHS is non-attribute.
c4b93f5
Jul 24, 2013
Alfred Wong Specified column type for quote_value
When calling quote_value the underlying connection sometimes requires
more information about the column to properly return the correct quoted
value.

I ran into this issue when using optimistic locking in JRuby and the
activerecord-jdbcmssql-adapter. In SQLSever 2000, we aren't allowed to
insert a integer into a NVARCHAR column type so we need to format it as
N'3' if we want to insert into the NVARCHAR type. Unfortuantely, without
the column type being passed the connection adapter cannot properly return
the correct quote value because it doesn't know to return N'3' or '3'.

This patch is fairly straight forward where it just passes in the column
type into the quote_value, as it already has the ability to take in the column,
so it can properly handle at the connection level.

I've added the tests required to make sure that the quote_value method
is being passed the column type so that the underlying connection can
determine how to quote the value.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/locking/optimistic.rb
33e1604
Ben Woosley Tidy up the "Specified column type for quote_value" changes
This includes fixing typos in changelog, removing a deprecated
mocha/setup test require, and preferring the `column_for_attribute`
accessor over direct access to the columns_hash in the new code.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/locking/optimistic.rb
b4dea61
Rafael Mendonça França Fix broken test
quote_value is called on the object not the class
1463fbe
Jul 30, 2013
Rafael Mendonça França Move changelog entry to the top [ci skip] 773eca0
Aug 05, 2013
Kassio Borges Load fixtures from linked folders 0ec701d
Rafael Mendonça França Merge pull request #11765 from kassio/load-fixtures-from-linked-folder
Load fixtures from linked folder
5f8a7d1
Siong Make `rake doc:guides` works again. Fix #10384.
Conflicts:
	railties/guides/rails_guides.rb
	railties/lib/rails/tasks/documentation.rake
946ad5d
Aug 18, 2013
Fix test incompatible with 1.8.7 93f1a72
Guillermo Iguaran Merge pull request #11930 from UncleGene/ties_test
Fix test incompatible with 1.8.7
6d9050b
Fix 1.8.7 incompatible respond_to_missing adf6e30
Aug 24, 2013
Kassio Borges fix issue #11605 424a5a7
Aug 25, 2013
Rafael Mendonça França Merge pull request #12006 from kassio/11605-render-with-context-format
Render with context format
e0fc5da
Aug 27, 2013
Aaron Patterson Merge pull request #12048 from tjouan/app_generator-bin_perms-umask
Comply with current umask when generating new app
Conflicts:
	railties/lib/rails/generators/rails/app/app_generator.rb
59a3561
Aug 30, 2013
Ben Maraney Fix STI scopes using benolee's suggestion. Fixes #11939 cf1904f
Sep 06, 2013
Brian pass the extra params to the rack test environment so that routes wit…
…h block constraints have access
03ac291
Sep 09, 2013
Arthur Nogueira Neves on SchemaCache use the connection getter instead of the obj given f0301e3
Sep 10, 2013
Santiago Pastorino Merge pull request #12176 from arthurnn/ar32_schema_cache
on SchemaCache use the connection getter instead of the obj given
143e009
Steve Klabnik Merge pull request #9368 from CrowdFlower/3-2-stable
PR #5219 backported to 3-2
cff8d1d
Sep 12, 2013
Fix FinderMethods#last unscoped primary key
Fixes table.joins(:relation).last(N) breaking on sqlite

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/finder_test.rb
c9642e3
Rafael Mendonça França Merge pull request #12196 from h-lame/fix-activesupport-cache-filesto…
…re-cleanup

Fix FileStore#cleanup to no longer rely on missing each_key method
Conflicts:
	activesupport/CHANGELOG.md
	activesupport/test/caching_test.rb
c539c68
Sep 25, 2013
Rafael Mendonça França Merge pull request #12359 from arthurnn/inverse_on_callbacks
Make sure inverse_of is visible on the has_many callbacks
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/models/company.rb
fdc3c08
Arthur Nogueira Neves on tests: dont always touch firm on validate e1bb9fc
Rafael Mendonça França Merge pull request #12364 from arthurnn/test_fix_validate
Fix query counters when testing with IdentityMap on 3.2
e82ceca
Sep 26, 2013
Arthur Nogueira Neves fix inverse_of when find_or_initialize_by_*
inverse_of relation was not being set when calling find_or_initialize_by_ and the entry was
found on the db.
fed6ac9
Sep 28, 2013
Rafael Mendonça França Use Ruby 1.8 hash syntax 50a9644
Rafael Mendonça França Merge pull request #12375 from arthurnn/inverse_after_find_or_initialize
Inverse after find or initialize
54c05ac
Sep 30, 2013
Arthur Nogueira Neves Move set_inverse_instance to association.build_record
[fixes #10371]
6798604
Rafael Mendonça França Merge pull request #12413 from arthurnn/inverse_of_on_build
Inverse of on build
ccd11d5
Michael Koziarski Remove the use of String#% when formatting durations in log messages
This avoids potential format string vulnerabilities where user-provided
data is interpolated into the log message before String#% is called.
5aee516
Oct 01, 2013
Tamir Duberstein make sure both headers are set before checking for ip spoofing 85106de
Andrew White Merge pull request #12410 from tamird/fix-ip-spoof-errors
Fix ip spoof errors
83c4b0a
Oct 03, 2013
Aaron Patterson Merge branch '3-2-stable' into 3-2-sec
* 3-2-stable:
  make sure both headers are set before checking for ip spoofing
  Move set_inverse_instance to association.build_record
befeeb2
Aaron Patterson Merge pull request #12084 from Ben-M/3-2-stable
Fix STI scopes using benolee's suggestion. Fixes #11939
31c79e2
Aaron Patterson bumping version to 3.2.15.rc1 5e277c8
Oct 04, 2013
Arthur Nogueira Neves Add back set_inverse_instance on .add_to_target
We must have it in there too, so when an existent record is being concat to another,
we will have the inverse relation.
655396c
Arthur Nogueira Neves add regression test for set_inverse_instance on add_to_target fc59e99
Rafael Mendonça França Merge pull request #12443 from arthurnn/add_inverse_of_add_target
Add inverse of add target
7ed5bdc
Rafael Mendonça França Merge pull request #12443 from arthurnn/add_inverse_of_add_target
Add inverse of add target
73dff26
Aaron Patterson bumping to rc2 5ede19b
Oct 10, 2013
Rafael Mendonça França Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_ta…
…rget"

This reverts commit 7ed5bdc, reversing
changes made to 31c79e2.

Reason: this caused a regression when the associated record is creted in
a before_create callback.

See #12413 (comment)
9639f65
Rafael Mendonça França Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"
This reverts commit ccd11d5, reversing
changes made to 54c05ac.

Reason: This caused a regression when the associated record is created
in a before_create callback. See
#12413 (comment)
6a185aa
Rafael Mendonça França Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_ta…
…rget"

This reverts commit 7ed5bdc, reversing
changes made to 31c79e2.

Reason: this caused a regression when the associated record is creted in
a before_create callback.

See #12413 (comment)
fbc69ac
Rafael Mendonça França Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"
This reverts commit ccd11d5, reversing
changes made to 54c05ac.

Reason: This caused a regression when the associated record is created
in a before_create callback. See
#12413 (comment)
38aefa5
Oct 11, 2013
Aaron Patterson bumping to rc3 e3abd78
Oct 15, 2013
Aaron Patterson Merge branch '3-2-15' into 3-2-sec
* 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
eb8807e
Aaron Patterson bumping to 3.2.15 2a0c440
Oct 16, 2013
Aaron Patterson updating changelogs 538f8ba
Aaron Patterson Merge branch '3-2-sec' into 3-2-stable
* 3-2-sec:
  updating changelogs
  bumping to 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
  Remove the use of String#% when formatting durations in log messages

Conflicts:
	activerecord/CHANGELOG.md
5f844d6
Nov 30, 2013
Aaron Patterson Only use valid mime type symbols as cache keys
CVE-2013-6414
bee3b7f
Dec 02, 2013
Michael Koziarski Escape the unit value provided to number_to_currency
Fixes CVE-2013-6415

Previously the values were trusted blindly allowing for potential XSS attacks.
5ed70c5
Michael Koziarski Stop using i18n's built in HTML error handling.
i18n doesn't depend on active support which means it can't use our html_safe
code to do its escaping when generating the spans.  Rather than try to sanitize
the output from i18n, just revert to our old behaviour of rescuing the error
and constructing the tag ourselves.

Fixes: CVE-2013-4491

Conflicts:
	actionpack/lib/action_view/helpers/translation_helper.rb

Backport: 50afd8e
78790e4
Michael Koziarski Deep Munge the parameters for GET and POST
The previous implementation of this functionality could be accidentally
subverted by instantiating a raw Rack::Request before the first Rails::Request
was constructed.

Fixes CVE-2013-6417

Conflicts:
	actionpack/lib/action_dispatch/http/request.rb
d5a4095
Aaron Patterson updating the changelog 6422630
Dec 04, 2013
Tobias Kraze repair a test broken by the number_to_currency XSS fix 9e625d6
Rafael Mendonça França Merge pull request #13162 from makandra/3-2-stable
Repair a test broken by the number_to_currency XSS fix
9c60e3d
Rafael Mendonça França Fix documentation of number_to_currency helper
Now users have to explicit mark the unit as safe if they trust it.

Closes #13161
c82025f
Carlos Antonio da Silva Merge pull request #13183 from sorah/never_ignore_i18n_translate_rais…
…e_option

Escalate missing error when :raise is true in translate helper, fix regression introduced by security fix.

Conflicts:
	actionpack/CHANGELOG.md
31a485f
Dec 13, 2013
Chris Maddox Update Session Store Documentation
session_id doesn't need to be a text column, just string (VARCHAR)
1805682
Rafael Mendonça França Merge pull request #13315 from tyre/patch-1
Update Session Store Documentation
3a429e6
Jan 06, 2014
Josef Šimánek Fix force_ssl.rb documentation. Close tt tag.
[ci skip]
c13eb1c
Damien Mathieu Merge pull request #13613 from simi/patch-1
Fix force_ssl.rb documentation. Close tt tag.
5a84d3e
Feb 18, 2014
Rafael Mendonça França Escape format, negative_format and units options of number helpers
Previously the values of these options were trusted leading to
potential XSS vulnerabilities.

Fixes: CVE-2014-0081
eaa2101
Rafael Mendonça França Use the reference for the mime type to get the format
Before we were calling to_sym in the mime type, even when it is unknown
what can cause denial of service since symbols are not removed by the
garbage collector.

Fixes: CVE-2014-0082
388d2f8
Rafael Mendonça França Preparing for 3.2.17 release 666e9f6
Rafael Mendonça França Merge branch '3-2-17' into 3-2-stable
Conflicts:
	actionpack/CHANGELOG.md
a3bda38