Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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
Commits on Mar 13, 2014
@orangejulius orangejulius Use Sqlite3 adapter in examples
Two bits of example code use sqlite as an adapter, which doesn't exist.
Using the code verbatim will raise a LoadError exception:

    ActiveRecord::Base.establish_connection(
      "adapter"  => "sqlite",
      "database" => "db.sqlite"
    )
    # => LoadError: Could not load 'active_record/connection_adapters/sqlite_adapter'...

Considering this is code a lot of people new to Rails might be running,
it's especially confusing.

Closes #14367 [ci skip]
2f19263
@tenderlove tenderlove make tests pass on Ruby 2.2
Apparently we've been using a buggy feature for the past 6 years:

  https://bugs.ruby-lang.org/issues/9593
2ce5e08
@rafaelfranca rafaelfranca Merge pull request #14372 from arthurnn/fix_query_cache_binds
Make select_all on query cache accept a Relation without binds.
Conflicts:
	activerecord/CHANGELOG.md
cf57853
@rafaelfranca rafaelfranca No need to binds be optional d2b0653
Commits on Mar 14, 2014
@rafaelfranca rafaelfranca Force sass-rails ~> 4.0.2 to avoid sprockets compatibility error
See rails/sass-rails#191 for more information
d436477
@rafaelfranca rafaelfranca Merge branch '4-0-4' into 4-0-stable
Conflicts:
	activerecord/CHANGELOG.md
eb39505
@zzak zzak Fix typo in ActiveSupport CHANGELOG 76c7ecd
@rafaelfranca rafaelfranca Merge pull request #14381 from zzak/as_changelog_typo
Fix typo in ActiveSupport CHANGELOG
ed2c313
Commits on Mar 16, 2014
@pixeltrix pixeltrix Use nested_scope? not shallow? to determine whether to copy options
The method `shallow?` returns false if the parent resource is a singleton so
we need to check if we're not inside a nested scope before copying the :path
and :as options to their shallow equivalents.

Fixes #14388.

(cherry picked from commit 924345abcff0101e3221f87d1d56d3d6517a79a4)

Conflicts:
	actionpack/CHANGELOG.md
a6b9ea2
Commits on Mar 17, 2014
@arthurnn arthurnn Fix counter cache when association uses a class_name
The idea of this commits is from
bf28422, which fixes this problem, but
only on AR 4.1+

[fixes #14369]
64ccb19
Commits on Mar 18, 2014
@chancancode chancancode Merge pull request #14410 from arthurnn/fix_14369
Fix counter cache when association uses a class_name
7549dba
Commits on Mar 20, 2014
@senny senny only dump schema information if migration table exists. Closes #14217
Conflicts:

	activerecord/CHANGELOG.md
18176f3
@chancancode chancancode The digest option is no longer honoured since Rails 3.0 [ci skip]
Closes #8513
9f8ee0b
@senny senny test for structure:dump without schema information table. refs eafec46
This is a test case for the fix provided in eafec46
8030534
Commits on Mar 23, 2014
@vlal vlal Swapped parameters of assert_equal in assert_select 9fccb3c
Commits on Mar 25, 2014
@rafaelfranca rafaelfranca Merge pull request #14468 from izoomi/date_select_helper
Fix date_select with_css_classes: true option overwriting other html classes
Conflicts:
	actionview/CHANGELOG.md
7f9cb9c
@rafaelfranca rafaelfranca Merge pull request #14390 from huoxito/true-touch
Still touch associations when theres no timestamp
05f62fc
@rafaelfranca rafaelfranca Use rails conventions ba70017
Commits on Mar 27, 2014
@rafaelfranca rafaelfranca Merge pull request #14393 from chrisfinne/persisted_exception
AR .persisted? throws SystemStackError for an unsaved model with a
custom primary_key that didn't save due to validation error

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/models/movie.rb
93ed89d
@tiegz tiegz Swap Timestamp/Callbacks inheritance in ActiveRecord::Base
Fixes a regression in the lookup chain for update_record &
create_record. Timestamp's methods were being executed before
Callback's.
3de4c56
@rafaelfranca rafaelfranca Merge pull request #14469 from tiegz/timestamp_inheritance_fix
Swap Timestamp/Callbacks order in ActiveRecord::Base
b117206
@rafaelfranca rafaelfranca Add CHANGELOG entry for #14469 [ci skip] 17b5aac
Commits on Mar 28, 2014
@rafaelfranca rafaelfranca Merge pull request #12778 from etehtsea/rake-default-fix
Don't load test env by default.

Closes #13241

Conflicts:
	railties/CHANGELOG.md
a263d0b
@kreynolds kreynolds Replace trivial regexp with string or index, twice as fast f14c74f
@fxn fxn Merge pull request #14520 from kreynolds/replace-regexp-with-index-or…
…-string

Replace trivial regexp with string or index, twice as fast
791d235
Commits on Mar 30, 2014
@rafaelfranca rafaelfranca Merge pull request #14518 from Peeja/hash-wia-update-respects-to-hash…
…-4-1-stable

HashWithIndifferentAccess better respects #to_hash (4-1-stable backport)
Conflicts:
	activesupport/CHANGELOG.md
c74ee5f
@rafaelfranca rafaelfranca Fix build with bundler 1.6 6fc7708
@rafaelfranca rafaelfranca Merge pull request #14509 from lukesteensen/pg-array-defaults
remove calls to sql_type on pg columns
Conflicts:
	activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
	activerecord/test/cases/adapters/postgresql/array_test.rb
1dc609c
Commits on Mar 31, 2014
@iancanderson iancanderson Tiny doc fix for Strong Parameters
- accepts_nested_attribute_for -> accepts_nested_attributes_for
17ddc1b
@guilleiguaran guilleiguaran Merge pull request #14539 from lparedes/master
Do not overwrite selected and disabled attributes
Conflicts:
	actionpack/lib/action_view/helpers/form_options_helper.rb
9310741
Commits on Apr 03, 2014
@thedarkone thedarkone Fix polymorphic preloads on NOT NULL _type columns.
Defer to Association#klass instead of having a custom/duplicate code.
53a5f36
@thedarkone thedarkone Simplify Preloader#grouped_records code.
The new method relies on AR::Associations::Association knowing about both reflection and a model class.

AR::Base#association now raises a descriptive error when trying to access non-existent associations. Previously it would blow up with a confusing NoMethodError: undefined method `association_class' for nil:NilClass.
48f1065
@rafaelfranca rafaelfranca Merge pull request #14580 from thedarkone/4-0-stable-backport-14532
Backport #14532 into 4-0-stable
13d5db7
@rafaelfranca rafaelfranca Merge pull request #14572 from laurocaetano/with_options_and_scope
Fix error when using `with_options` with lambda.

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/associations/has_many_associations_test.rb
c5af132
Commits on Apr 04, 2014
@rafaelfranca rafaelfranca Merge pull request #14562 from jefflai2/collection_proxy
CollectionProxy uses the arel of its association's scope.

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/relations_test.rb
b30104c
@nanaya nanaya Stray nodoc causes rest of file not parsed [ci skip] 650a05c
@rafaelfranca rafaelfranca Merge pull request #14605 from laurocaetano/fix_nodoc_on_collection_p…
…roxy

Backport to fix wrong nodoc on collection proxy.
c2d84ea
@rafaelfranca rafaelfranca Merge pull request #11650 from prathamesh-sonpatki/rename
Renamed private methods _create_record and _update_record

Conflicts:
	activerecord/lib/active_record/persistence.rb
	activerecord/lib/active_record/relation.rb
	activerecord/test/cases/associations/belongs_to_associations_test.rb
1755958
@rafaelfranca rafaelfranca Fix the test defining the models in the right place
Conflicts:
	activerecord/test/cases/associations/belongs_to_associations_test.rb
	activerecord/test/schema/schema.rb
a0804f7
Commits on Apr 07, 2014
@spastorino spastorino Merge pull request #14631 from laurocaetano/fix_count_with_order
Ignore order when doing count.
890d4f3
Commits on Apr 09, 2014
@rafaelfranca rafaelfranca Allow to use sprockets-rails 2.1 9067a95
@rafaelfranca rafaelfranca Define the required asset 6ed464f
Commits on Apr 10, 2014
@rafaelfranca rafaelfranca Merge pull request #12829 from iantropov/issue_insert_via_hmt_scope_3548
Fix insertion of records for hmt association with scope

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation.rb
fca54a1
Commits on Apr 11, 2014
@pixeltrix pixeltrix Merge pull request #14684 from Futurelearn/jc-deep-nested-shallow-url…
…-helper-bug

Add a failing test for a URL helper that was broken by a6b9ea2.

(cherry picked from commit 1424482)

Conflicts:
	actionpack/CHANGELOG.md
d0e5963
Commits on Apr 13, 2014
@senny senny PostgreSQL, warn once per connection per missing OID. Closes #14275.
[Yves Senn & Matthew Draper]

(cherry picked from commit 9f62344)

This is a partial backport of #14692.

Conflicts:
    activerecord/CHANGELOG.md
    activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
    activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
	activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
47f7171
@rafaelfranca rafaelfranca Merge pull request #14592 from laurocaetano/equality_between_relation…
…_and_collection_proxy

The comparison between `Relation` and `CollectionProxy` should be consistent.

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/association_relation.rb
	activerecord/test/cases/base_test.rb
5372ec2
Commits on Apr 14, 2014
@senny senny docs, double meaning of `serialize` argument. Closes #14284.
The second argument to serialize has double meaning:
  * `class_name` of the Type to serialize
  * `coder` to use then serializing.

The new variable name and the docs better describe that behavior.
329d46d
@rafaelfranca rafaelfranca Merge pull request #14736 from nashby/hidden-index
`collection_check_boxes` respects `:index` option for the hidden filed name
Conflicts:
	actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
	actionpack/test/template/form_collections_helper_test.rb
	actionview/CHANGELOG.md
3448ea0
@rafaelfranca rafaelfranca Use the index on hidden field e0fe8dd
@rafaelfranca rafaelfranca Return null type format when format is not know
When requesting a controller with the following code with a unknown format:

    def my_action
      respond_to do |format|
        format.json { head :ok }
        format.any { render text: 'Default response' }
      end
    end

we should render the default response instead of raising ActionController::UnknownFormat

Fixes #14462
75509d1
Commits on Apr 15, 2014
@senny senny Merge pull request #14728 from stomar/assertion-msg
Remove surplus period from assertion messages
f23e30b
@rafaelfranca rafaelfranca Merge pull request #14766 from eric-chahin/migration_bug
Changed change_column in PG schema_statements.rb to make sure that the u...
Conflicts:
	activerecord/test/cases/adapters/postgresql/uuid_test.rb

Conflicts:
	activerecord/test/cases/adapters/postgresql/uuid_test.rb
b0fa1a6
Commits on Apr 16, 2014
@rafaelfranca rafaelfranca Merge pull request #14770 from crazymykl/avoid_dos_vuln_in_i18n_guide
Avoid suggesting dangerous code in i18n guide
Conflicts:
	guides/source/i18n.md
112896b
@senny senny Merge pull request #14773 from eric-chahin/null_relation_fix
Changed the NullRelation so that when count is called with #group it wil...
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/null_relation.rb
f5417fc
Commits on Apr 17, 2014
@rafaelfranca rafaelfranca Merge pull request #14783 from hakanensari/autoload-strict-validation…
…-failed

Autoload ActiveModel::StrictValidationFailed
b8a91a6
Commits on Apr 18, 2014
@rafaelfranca rafaelfranca Merge pull request #14793 from arthurnn/fixes_8928
Fixed has_many association to make it support irregular inflections.
88d8f6e
@senny senny Merge pull request #14796 from kuldeepaggarwal/fix-save-issue
when a destroyed record is duped, it is no longer ´destroyed?`.
d63c39f
Commits on Apr 23, 2014
@rafaelfranca rafaelfranca Merge pull request #14757 from estsauver/14752
Fix behavior of select! to be consistent with select #14752

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/delegation.rb
	activerecord/lib/active_record/relation/query_methods.rb
	activerecord/test/cases/relation/mutation_test.rb
0ce2e90
@al2o3cr al2o3cr Correctly handle joining scoped associations with table aliases.
Backport of #14154 to 4-0-stable.
4262797
Commits on May 01, 2014
@rafaelfranca rafaelfranca Merge pull request #13640 from maginatics/fix_sqlite3_ensure_master
SQLite3: Always close statements.

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
84b987d
@rafaelfranca rafaelfranca Merge pull request #14915 from juanpastas/patch-1
Update mapper.rb

[ci skip]

Conflicts:
	actionpack/lib/action_dispatch/routing/mapper.rb
6ce807c
@rafaelfranca rafaelfranca Rescue the right exception 1f3f6f4
@rafaelfranca rafaelfranca Merge pull request #14932 from phoet/use_file_join
always use File.join in asset_path
Conflicts:
	actionview/CHANGELOG.md
3bf02ae
@rafaelfranca rafaelfranca Merge pull request #14896 from jetthoughts/14895_overide_strict_by_sq…
…l_mode

Symbolize variables of mysql/mysql2 connection configuration

Conflicts:
	activerecord/CHANGELOG.md
e60553f
Commits on May 02, 2014
@arunagw arunagw memcached service is required to run few specs 6e3d689
@guilleiguaran guilleiguaran Merge pull request #14944 from arunagw/aa-added-memcached-to-travis
memcached service is required to run few specs
2961fa8
Commits on May 06, 2014
@rafaelfranca rafaelfranca Merge branch '4-0-sec' into 4-0-stable
Conflicts:
	actionpack/CHANGELOG.md
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md
	railties/CHANGELOG.md
7dfe5b0
Commits on May 07, 2014
@arunagw arunagw Update links to new rails version in guides [ci skip] fc8b67e
@senny senny Merge pull request #15012 from schneems/schneems/headers-key
HTTP::Headers#key? correctly converts
3b03c98
@rafaelfranca rafaelfranca Merge branch 'rm-trasaction-fix-13166'
Conflicts:
	activerecord/CHANGELOG.md

Backport of #13166
8de5d76
@rafaelfranca rafaelfranca Merge pull request #12746 from coreyward/master
Fix Hash#deep_merge bug and improve documentation — resolves #12738

Conflicts:
	activesupport/lib/active_support/core_ext/hash/deep_merge.rb
	activesupport/test/core_ext/hash_ext_test.rb
1e86e60
Commits on May 08, 2014
@arthurnn arthurnn Dup the changed_attributes otherwise we could lose them 3d057a0
@fredwu fredwu Fixed HABTM's CollectionAssociation size
HABTM should not include new records as part of #count_records as new records are already counted.

This addresses #14914.
9d4e2ab
@carlosantoniodasilva carlosantoniodasilva Merge pull request #14995 from fredwu/habtm_relation_size_calculation…
…_fix-4-0-stable

Habtm relation size calculation fix for 4.0 branch
bb13648
Commits on May 09, 2014
@rafaelfranca rafaelfranca Merge pull request #15042 from arthurnn/revert_dirty_transactions
Reverts dirty track restore on transactions rollback
Conflicts:
	activerecord/CHANGELOG.md
06f210f
@rafaelfranca rafaelfranca Merge pull request #15044 from zzak/travis_ruby_too_won
Only need MINOR version level to test Ruby 2.1.x on Travis
Conflicts:
	.travis.yml
5c09373
@tenderlove tenderlove use fnmatch to test for case insensitive file systems 6901012
Commits on May 10, 2014
@tenderlove tenderlove feature detect for FNM_EXTGLOB for older Ruby. Fixes #15053 68d2128
Commits on May 11, 2014
@guiocavalcanti guiocavalcanti ActionDispatch::Http::URL.normalize_port should not strip port for pr…
…otocol relative URL.

(cherry picked from commit be93d94)
11fc217
@pixeltrix pixeltrix Always use the provided port for protocol relative urls
There may be situations where you need to tunnel SSL connections over
port 80 so we shouldn't remove it if it has been explicitly provided.

(cherry picked from commit 2378f69)

Conflicts:
	actionpack/CHANGELOG.md
c63e64f
Commits on May 12, 2014
@senny senny pg, `change_column_default` accepts `[]`. Closes #11586.
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
	activerecord/test/cases/adapters/postgresql/array_test.rb
50bfc51
Commits on May 14, 2014
@senny senny `stored_attributes` need to be specific to a subclass.
Currently they are all stored globally in the same `Hash`.
This commit forces the creation of a per-class variable if necessary.

The behavior was exposed through the following test-case:

```
  1) Failure:
StoreTest#test_all_stored_attributes_are_returned [/Users/senny/Projects/rails/activerecord/test/cases/store_test.rb:151]:
--- expected
+++ actual
@@ -1 +1 @@
-[:color, :homepage, :favorite_food]
+[:resolution, :color, :homepage, :favorite_food]
```

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/store_test.rb
69fc26f
@matthewd matthewd Merge pull request #14833 from jyao6/attribute_inheritance
Fixed Attribute Inheritance Issue

Conflicts:
	activerecord/CHANGELOG.md
2fe11e4
@tenderlove tenderlove Merge pull request #14546 from eileencodes/fix_delete_all_to_not_use_…
…IN_statement

Fix delete all to not produce sql in statement
Conflicts:
	activerecord/test/cases/associations/has_many_associations_test.rb

Merge pull request #14727 from robin850/patch-17

Add a changelog entry for #14546 [ci skip]

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/associations/collection_association.rb
	activerecord/test/cases/associations/has_many_associations_test.rb
	activerecord/test/cases/test_case.rb
b8f419c
@rafaelfranca rafaelfranca Merge pull request #15078 from nbudin/fix_merger_filter_binds_compari…
…son_master

Make filter_binds filter out symbols that are equal to strings

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/merger.rb
	activerecord/test/cases/relation/merging_test.rb
11cfe10
Commits on May 15, 2014
@pixeltrix pixeltrix Add missing requires for require 'action_dispatch/routing'
(cherry picked from commit ee8dc39)
e57328d
@rafaelfranca rafaelfranca Merge pull request #15118 from khelben/head_with_status_action_stack_…
…level_too_deep

fixes stack level too deep exception on action named 'status' rendering 'head :ok'

Conflicts:
	actionpack/CHANGELOG.md
b4a2c96
Commits on May 18, 2014
@tenderlove tenderlove Feature detect based on Ruby version.
I didn't want to do this, FNM_EXTGLOB is defined on 2.1.x, but Dir.glob
returns the wrong value on Ruby less than 2.2.0.  Checking for a
case-insensitive FS seems too hard, so just check Ruby version  Checking
for a case-insensitive FS seems too hard, so just check Ruby version.
52ecae4
Commits on May 19, 2014
@rafaelfranca rafaelfranca Merge pull request #10798 from jcxplorer/fix-enable_extension-with-ta…
…ble_name_prefix

Fix migrations that use enable_extension with table_name_prefix/suffix

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/migration.rb

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/migration.rb
472a2bb
Commits on May 20, 2014
@senny senny docs, `instantiate` expects `String` keys. [Rafal Piekarski & Yves Senn]
Closes #15122
Closes #15107

Conflicts:
	activerecord/test/cases/persistence_test.rb
bb39fff
@matthewd matthewd Merge pull request #14965 from eric-chahin/issue_14824
Fixed the inferred table name of a HABTM auxiliar

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
9c3c559
@rafaelfranca rafaelfranca Test with ruby-head to make @tenderlove happy
Conflicts:
	.travis.yml
c939ca1
@rafaelfranca rafaelfranca Using released sprockets e12adfe
@rafaelfranca rafaelfranca Copy-edit at the CHANGELOGS [ci skip] c9d544d
Commits on May 21, 2014
@rafaelfranca rafaelfranca Merge pull request #14544 from jefflai2/named_scope_sti
Fixes Issue #13466.

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/scoping/named.rb
807ee0a
@rafaelfranca rafaelfranca Merge pull request #10887 from sakuro/deep_transform_keys_in_nested_a…
…rrays

Hash#deep_*_keys(!) recurse into nested arrays.

Conflicts:
	activesupport/CHANGELOG.md

Conflicts:
	activesupport/CHANGELOG.md
81c8239
@pixeltrix pixeltrix Only make deeply nested routes shallow when parent is shallow
Since `:shallow` may be set at any point in the resource nesting we should
only make the new and collection routes shallow when the parent is shallow.

This is a bit of a hack but until the mapper is refactored to an object graph
instead of a hash of merged values it's the best we can do.

Fixes #14684.

(cherry picked from commit e10f26f)

Conflicts:
	actionpack/CHANGELOG.md
d1ef6c2
@pixeltrix pixeltrix Revert "Only make deeply nested routes shallow when parent is shallow"
This reverts commit d1ef6c2.
e2f124a
@senny senny build fix, use lambda syntax that ruby 1.9.3 understands.
(cherry picked from commit b452e4a)
1a25159
@rafaelfranca rafaelfranca Revert "Merge pull request #14544 from jefflai2/named_scope_sti"
This reverts commit 807ee0a.

Conflicts:
	activerecord/test/models/comment.rb

This change break integration with activerecord-deprecated_finders so
I'm reverting until we find a way to make it work with this gem.
7a1a945
Commits on May 24, 2014
@kemper kemper Don't recurse infinitely when calling non-existent method on super f70058a
@tenderlove tenderlove fix test from 7537057 7afd944
@rafaelfranca rafaelfranca Merge pull request #14986 from dlangevin/trailing-slash-url-generation
Fixes URL generation with trailing_slash: true

Conflicts:
	actionpack/lib/action_dispatch/http/url.rb

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_dispatch/http/url.rb

Conflicts:
	actionpack/CHANGELOG.md
f62de49
@rafaelfranca rafaelfranca Merge pull request #9083 from bronson/patch-1
avoid using alias in generators
0467a63
@rafaelfranca rafaelfranca Add FIXME note about the thor bug 54d9b3c
Commits on May 26, 2014
@rafaelfranca rafaelfranca Escape user input before showing in the page.
This is not a security issue since this page is not present in
production and user have to type something in the field but is better to
escape the input.
800a30f
Commits on May 27, 2014
@rafaelfranca rafaelfranca Fix the release task f8325cd
@rafaelfranca rafaelfranca Preparing for 4.0.6.rc1 release 1006828
Commits on May 28, 2014
@senny senny Revert "Merge pull request #12778 from etehtsea/rake-default-fix"
This reverts commit a263d0b.

Conflicts:
	railties/CHANGELOG.md
f4b9df2
@zzak zzak Upgrading Ruby on Rails guide is no longer WIP [ci skip] bcd9b02
Commits on Jun 09, 2014
@rafaelfranca rafaelfranca Do not try to set the foreign_key again on has_many through
Integration tests are inside protected_attributes test suite.

Fixes #15496
Fixes rails/protected_attributes#35
d3dc083
@rafaelfranca rafaelfranca Timestamp values should be present on callbacks
This reverts commit dd3ea17 and add a
regression test.

Fixes #15418

Conflicts:
	activerecord/CHANGELOG.md
1d56f05
Commits on Jun 13, 2014
@rafaelfranca rafaelfranca Merge pull request #15701 from zzak/issue_15496
Open extension point for defining options in build_through_record
8a3895b
Commits on Jun 16, 2014
@rafaelfranca rafaelfranca Preparing for 4.0.6.rc2 release 13c6bac
Commits on Jun 17, 2014
@jonatack jonatack 4.0.6 ActionPack CHANGELOG grammar pass [ci skip]
'cos it looked like it could use a little more <3
e51e48d
@rafaelfranca rafaelfranca Merge pull request #15776 from jonatack/patch-7
4.0.6 ActionPack CHANGELOG grammar pass [ci skip]
37b4c13
@robin850 robin850 Fix a tiny typo in Action Pack's changelog [ci skip] e9ba03e
Commits on Jun 19, 2014
@rafaelfranca rafaelfranca Merge pull request #15772 from nbudin/sti_through_bug
Don't include inheritance column in the through_scope_attributes

Conflicts:
	activerecord/test/cases/associations/has_many_through_associations_test.rb
b4c30d8
@rafaelfranca rafaelfranca Add missing model f3a2b61
Commits on Jun 23, 2014
@rafaelfranca rafaelfranca Preparing for 4.0.6.rc3 release 9649cb4