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 Jul 17, 2013
@arunagw arunagw Added routing in test for actionpack
(cherry picked from commit 96310f6)

Conflicts:
	actionpack/Rakefile
61d3138
@pixeltrix pixeltrix Fix failing test missed for the past year :(
When optimized path helpers were re-introduced in d7014bc the test added
in a328f2f broke but no-one noticed because it wasn't being run by the
test suite.

Fix the test by checking for nil values or empty strings after the args
have been parameterized.
(cherry picked from commit 74722d6)
748e09b
@pixeltrix pixeltrix Refactor to reduce number of loops
Only build the missing_keys array once we have detected that there
actually are missing keys by moving the check to be part of the block
that performs the path substitution.
(cherry picked from commit 1a58ac6)
1ad6c8d
@arunagw arunagw Fixed typo in guides [ci skip] fafe47e
@senny senny Merge pull request #11473 from arunagw/guides_typo
Fixed typo in guides [ci skip]
c2e5e09
@carlosantoniodasilva carlosantoniodasilva Merge pull request #11469 from bvogel/master
Update bcrypt-ruby stable version to 3.1
e8c89c9
@arunagw arunagw Fixed README link in API [ci skip]
This should not be a link because
it's creating a link with activesupport README right now
5b9f667
Commits on Jul 18, 2013
@rafaelfranca rafaelfranca Fix examples of number_to_percentage
[ci skip]
c483e83
@rafaelfranca rafaelfranca Use the canonical router on the CHANGELOG entry
Thanks @egilburg

[ci skip]

Conflicts:
	actionview/CHANGELOG.md
62225ae
Commits on Jul 19, 2013
@senny senny fix typo in Active Record Validations guide. [ci skip].
Closes #11498.

Conflicts:

	guides/source/active_record_validations.md
a5a20da
Commits on Jul 21, 2013
@senny senny Merge pull request #11515 from prathamesh-sonpatki/edit-index-page
Removed information about creating database [ci skip]
10f34b8
@pixeltrix pixeltrix Clear named routes when routes.rb is reloaded
Fix an issue where Journey was failing to clear the named routes hash when the
routes were reloaded and since it doesn't overwrite existing routes then if a
route changed but wasn't renamed it kept the old definition. This was being
masked by the optimised url helpers so it only became apparent when passing an
options hash to the url helper.

(cherry picked from commit e5275f9)

Conflicts:
	actionpack/CHANGELOG.md
2f73ad7
Commits on Jul 22, 2013
@ssimeonov ssimeonov [Fixes #11512] improves cache size calculation in ActiveSupport::Cach…
…e::MemoryStore

Previously, the cache size of `ActiveSupport::Cache::MemoryStore` was calculated
as the sum of the size of its entries, ignoring the size of keys and any data
structure overhead. This could lead to the calculated cache size sometimes being
10-100x smaller than the memory used, e.g., in the case of small values.

The size of a key/entry pair is now calculated via `#cached_size`:

    def cached_size(key, entry)
      key.to_s.bytesize + entry.size + PER_ENTRY_OVERHEAD
    end

The value of `PER_ENTRY_OVERHEAD` is 240 bytes based on an [empirical
estimation](https://gist.github.com/ssimeonov/6047200) for 64-bit MRI on
1.9.3 and 2.0.

Fixes GH#11512 #11512

Conflicts:
	activesupport/CHANGELOG.md
bddb73e
@zzak zzak backport efeb039 from #11201 fixes #11540 [ci skip] 5ddb94d
@rafaelfranca rafaelfranca Merge pull request #11562 from zzak/backport_efeb039
backport efeb039 from #11201 fixes #11540 [ci skip]
883598b
Commits on Jul 23, 2013
@rafaelfranca rafaelfranca Merge pull request #11566 from rajcybage/master
add the missing middleware in command line guides rake about [ci skip]
Conflicts:
	guides/source/command_line.md
01c58b7
@zzak zzak Use GeneratedAttribute#column_name if #reference? scaffold_generator …
…in _form view [Fixes #11573]
d89b19d
Commits on Jul 24, 2013
@rafaelfranca rafaelfranca Merge pull request #11570 from joelcogen/harmonize_text_field_and_area
text_area should handle nil value option like text_field
Conflicts:
	actionview/CHANGELOG.md
5e0307e
@alfredw alfredw 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
07aebf0
@Empact Empact 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
aae745b
@bughit bughit don't convert mailer default values to procs
Invoke mailer defaults as procs only if they are procs, do not convert
with to_proc.  That an object is convertible to a proc does not mean it's
meant to be always used as a proc.  Fixes #11533

Conflicts:
	actionmailer/CHANGELOG.md
4f6e6e1
@rafaelfranca rafaelfranca Merge pull request #11581 from bughit/11533_to_proc_backport
don't convert mailer default values to procs
c4f7a0c
@rafaelfranca rafaelfranca New CHANGELOG entries are always on top
[ci skip]
2b96df3
Commits on Jul 25, 2013
@pixeltrix pixeltrix Allow overriding of all headers from passed environment hash
Allow REMOTE_ADDR, HTTP_HOST and HTTP_USER_AGENT to be overridden from
the environment passed into `ActionDispatch::TestRequest.new`.

Fixes #11590

(cherry picked from commit 4db0637)

Conflicts:
	actionpack/CHANGELOG.md
a38bb56
@carlosantoniodasilva carlosantoniodasilva Merge pull request #11591 from ankit8898/typo
Typo fix [ci skip]
f7dc7e9
@steveklabnik steveklabnik rake -> bin/rake 7c9d2c5
@amatsuda amatsuda Don't mutate the Base settings by merge!ing the given value e042730
Commits on Jul 27, 2013
@spastorino spastorino Merge pull request #11620 from spajus/update_docs
Update Rails 3.2.x guide link [ci skip]
d504641
Commits on Jul 29, 2013
@carlosantoniodasilva carlosantoniodasilva Merge pull request #11653 from ankit8898/typo
Fixing the broken URL [skip ci]
d1ecd40
Commits on Jul 30, 2013
@rafaelfranca rafaelfranca Revert change on ActiveRecord::Relation#order method that prepends new
order on the old ones

The previous behavior added a major backward incompatibility since it
impossible to have a upgrade path without major changes on the
application code.

We are taking the most conservative path to be consistent with the idea
of having a smoother upgrade on Rails 4.

We are reverting the behavior for what was in Rails 3.x and,
if needed, we will implement a new API to prepend the order clauses in
Rails 4.1.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/query_methods.rb
	guides/source/upgrading_ruby_on_rails.md
609dae1
@rafaelfranca rafaelfranca Merge pull request #11664 from thedarkone/digestor-thread-safety
AV::Digestor thread safety fixes
766148f
Commits on Aug 01, 2013
@rafaelfranca rafaelfranca Fix `current_page?` when the URL contains escaped characters
In some cases webservers like nginx send the escaped characters
lowercased to the Rails application. The current_page? helper was
comparing the escaped strings that are different since Ruby escapes the
URL using uppercased characters.

Conflicts:
	actionview/CHANGELOG.md
d491d7b
@rafaelfranca rafaelfranca Make current_page? compare binary strings 0830ff9
@rafaelfranca rafaelfranca Use the right minitest method 58cd859
Commits on Aug 02, 2013
@carlosantoniodasilva carlosantoniodasilva Backport changelog fixed from #11713 [ci skip] 5fdb47e
@rafaelfranca rafaelfranca Merge pull request #11714 from jetthoughts/11706_remove_bad_override_…
…of_xml

Removed redundant xml override from pg adapter
Conflicts:
	activerecord/CHANGELOG.md
367f220
@carlosantoniodasilva carlosantoniodasilva Use assert_nil instead of testing for equality 5cc7431
@rafaelfranca rafaelfranca Merge pull request #11455 from antonio/fix_enable_extension_not_being…
…_defined

Define enable_extension method to prevent undefined method error
a02c6ea
@carlosantoniodasilva carlosantoniodasilva Merge pull request #11716 from jetthoughts/use_backquote_for_terms_in…
…_getting_strated

Replaced quotation marks for term by apostrophes in getting started guide [ci skip]
fa08b7a
@rafaelfranca rafaelfranca Enable jruby and rubinius on travis 2428580
@arunagw arunagw Using URI.parser.unescape to avoid warnings 64ce091
Commits on Aug 03, 2013
@senny senny Merge pull request #11724 from arunagw/warning-removed-ap
Using URI.parser.unescape to avoid warnings
5ab9126
@rafaelfranca rafaelfranca Merge pull request #11741 from Karunakar/failing_test_in_local
fix for postgresql failing test in local
ae86010
@rafaelfranca rafaelfranca Merge pull request #11712 from atambo/activesupport_testing_isolation…
…_jruby

Fix ActiveSupport::Testing::Isolation on jruby
ff20910
@rafaelfranca rafaelfranca Merge pull request #11738 from gaurish/guides-association-basics-fix
[Fixes #11734]Correct Association Basics Guide on has_and_belongs_to_many

[ci skip]
697fdec
@rafaelfranca rafaelfranca Merge pull request #11733 from iainbeeston/master
i18n guide update: corrected reference to activerecord to instead reference activemodel
Conflicts:
	guides/source/i18n.md

[ci skip]
1324e2e
@rafaelfranca rafaelfranca Revert "Merge pull request #11712 from atambo/activesupport_testing_i…
…solation_jruby"

This reverts commit ff20910.

Needs more work on 4-0-stable to make these tests work with JRuby
75d41df
Commits on Aug 04, 2013
@rafaelfranca rafaelfranca Merge pull request #11747 from bradly/guides_getting_started_fix
Add note that you must be in the rails app when starting the server
bab466e
@rafaelfranca rafaelfranca No need to abbreviate application
[ci skip]
f20b4fb
@rafaelfranca rafaelfranca Merge pull request #11737 from tkhr/fix-document-about-on-validation-…
…helpers

Fix active_record_validations.md document, `:save` for `on:` validation helper was never available
Conflicts:
	guides/source/active_record_validations.md

[ci skip]
35c247c
@guilleiguaran guilleiguaran Remove "Using Action View outside of Rails" section from AV overview …
…guide

The section was clearly wrong and was just an example about how to use ActiveSupport helpers in Rack/Sinatra

[ci skip]
6698945
@rafaelfranca rafaelfranca Merge pull request #11677 from jaggederest/master
update guide to reflect default HMAC SHA1 in MessageVerifier used in SignedCookieStore

[ci skip]
d11e762
@rafaelfranca rafaelfranca Merge pull request #11665 from mshytikov/fix-config-log_level
Rails.logger should have level specified by config.log_level.
Conflicts:
	activemodel/test/cases/railtie_test.rb
5deedc6
@rafaelfranca rafaelfranca Merge pull request #11751 from rmm5t/assert_dom_equal-message
Pass assert_dom_equal message arg to underlying assertion
Conflicts:
	actionpack/CHANGELOG.md
3231506
Commits on Aug 05, 2013
@rafaelfranca rafaelfranca Merge pull request #11757 from ryog/fix_document_active_model_errors
Fix: documentation for ActiveModel::Errors [ci skip]
8c94981
@rafaelfranca rafaelfranca Merge pull request #11760 from rahul100885/master
Added data for permit array into scalar value

[ci skip]
1d1905f
@fxn fxn getting started guide: pass the resource to the URL helper [ci skip]
Passing the actual ID is not idiomatic.
a11fb79
@fxn fxn migrations guide: fix and edits [ci skip] 046d52b
@carlosantoniodasilva carlosantoniodasilva Merge pull request #11762 from peterkovacs/patch-2
Free result_metadata directly instead of freeing 2nd, redundant call.
45764ad
@rafaelfranca rafaelfranca Use the right instrumentation name
The pattern is event.component

Closes #11769
aee5fe9
@josevalim josevalim Merge pull request #11763 from schneems/schneems/create-sqlite3db
Create sqlite3 directory if not present
Conflicts:
	activerecord/CHANGELOG.md
550da78
@rafaelfranca rafaelfranca config[:database] should be a string
This change was breaking the Railties tests. See
https://travis-ci.org/rails/rails/jobs/9865969
74fb2a1
Commits on Aug 06, 2013
@tenderlove tenderlove adding a weird test case
Conflicts:
	activerecord/test/cases/base_test.rb
aef61b4
@tenderlove tenderlove eagerly initialize the attributes module to avoid check-then-set race…
… conditions
7f1b3c1
@tenderlove tenderlove initialize ivars so we don't have to constantly check them c107164
@tenderlove tenderlove push attribute constant cache in to the attribute methods module 4b896f9
@tenderlove tenderlove initialize generated modules on inclusion and on inheritence ec50c75
@tenderlove tenderlove eagerly assign the attribute name cache, remove const_missing 532f89f
@tenderlove tenderlove making the comment more accurate a620105
@tenderlove tenderlove freeze the constant value so it isn't duped when used as a hash key
Conflicts:
	activerecord/lib/active_record/attribute_methods.rb
6ae08f2
@rafaelfranca rafaelfranca Merge pull request #11771 from atambo/jruby_assert_distance_of_time_i…
…n_words

Remove privatizing of Fixnum#/ from assert_distance_of_time_in_words
58c8d0e
@rafaelfranca rafaelfranca Merge pull request #11778 from jetthoughts/11759_update_assets_guides
Update Assets Pipeline Guide [ci skip]
Conflicts:
	guides/source/asset_pipeline.md
7bfbd04
@rafaelfranca rafaelfranca Merge pull request #11767 from kassio/master-load-fixtures-from-linke…
…d-folder

Load fixtures from linked folders[master]
06198ed
@rafaelfranca rafaelfranca Use the proper encoding comment on the file 1fd6633
Commits on Aug 07, 2013
@fxn fxn RDoc tweaks 1571c9e
Commits on Aug 08, 2013
@carlosantoniodasilva carlosantoniodasilva Merge pull request #11806 from jetthoughts/change_model_term_by_simpl…
…e_word

Remove using of suffix with term. [ci skip]
a6b7818
Commits on Aug 10, 2013
@rafaelfranca rafaelfranca Merge pull request #11799 from njakobsen/fix-controller-filter-callbacks
Execute conditional procs on controller filters only for current action
Conflicts:
	actionpack/CHANGELOG.md
ab8a833
Commits on Aug 12, 2013
@fxn fxn defines a new :abort deprecation behaviour that raises
See the CHANGELONG message in the patch for further details.
3152148
@fxn fxn fixes typo in CHANGELOG 8381a49
@fxn fxn renames the :abort deprecation behaviour to :raise
That is a better name, thanks @jeremy.
8a099f1
Commits on Aug 14, 2013
@senny senny Merge pull request #11756 from zilkey/master
added String#to_date documentation to Rails 4 upgrade guide [ci skip]
39555a5
@senny senny document `assert_not_XYZ` in place of `refute_XYZ`. d9f28aa
@tenderlove tenderlove Merge pull request #11802 from ko1/fix_field_encoding_for_mysql
Set field encoding to client_encoding for mysql adapter.
166b235
Commits on Aug 16, 2013
@carlosantoniodasilva carlosantoniodasilva Merge pull request #11910 from brendon/master
Use binary mode to write uploaded files [ci skip]
b3c263f
@robin850 robin850 Improve the testing guide [ci skip]
Improve the "Testing Rails Applications" guide adding a section for
testing helpers and a little note about associations with ActiveRecord
and YAML fixtures.

Also add a link to Fixture Builder ; yet another replacement for
fixtures such as Machinist or FactoryGirl.
5376251
Commits on Aug 18, 2013
@guilleiguaran guilleiguaran Rename @locals to @_locals in Thread to avoid conflict with Rubinius.…
… Closes #11831
ad7bae6
Commits on Aug 19, 2013
@guilleiguaran guilleiguaran oops, I missed this in 7193f75 8499061
@senny senny explain how to contribute to the documentation. [ci skip]
Follow-up to #11934

Conflicts:

	guides/source/contributing_to_ruby_on_rails.md
	guides/source/layout.html.erb
563634f
@fxn fxn let AR::FinderMethods#exists? return singletons in all cases [closes #…
…11592]

This fixes a regression. The documentation said in its introduction
paragraph that the method returns trythy/falsy, but then below it
was said that if there were no arguments you'd get `true` or `false`.
Also when the argument is exactly `false` a singleton is documented
to be returned.

The method was not returning the singletons so it didn't conform to
those special cases.

The best solution here seems to be to just return singletons in all
cases. This solution is backwards compatible. Also, the contract
has been revised because it has no sense that the predicate varies
that way depending on the input. I bet the previous contract was just
an accident, not something mixed on purpose.
1af0c17
@fxn fxn documents 1af0c17 in the CHANGELOG 4beac29
@rafaelfranca rafaelfranca Fix the indentation on the from template of the scaffold generator 443a1a2
@tenderlove tenderlove only reconnect if there was already an active connection
If you're using an in-memory database for the test database,
reconnecting will lose all information that schema:load did for us.
230c606
@baroquebobcat baroquebobcat ensure freeze on Thread freezes locals ec1227a
Commits on Aug 20, 2013
@neerajdotname neerajdotname fix bad test by making number that fits for integer
PR #10566 had to be reverted
because after applying the fix test
"test_raise_record_not_found_error_when_invalid_ids_are_passed"
started failing.

In this test invalid_id is being assigned a really large number
which was causing following failure when PR #10566 was applied.

```
RangeError: bignum too big to convert into `long long'
SELECT  `interests`.* FROM `interests`
WHERE `interests`.`man_id` = ? AND `interests`.`id` = ?
LIMIT 1  [["man_id", 970345987], ["id", 2394823094892348920348523452345]]
```

This test is not failing in master because when test code
`man.interests.find(invalid_id)` is executed then interests
are fully loaded in memory and no database query is executed.

After PR #10566 was merged then test code
`man.interests.find(invalid_id)` started executing sql query
and hence the error.

In case someone is wondering why the second part of query is not
failing, then that's because the actual query does not require
any variable substituation where the number is large. In that
case the sql generate is following.

```
SELECT `interests`.* FROM `interests`
WHERE `interests`.`man_id` = ? AND `interests`.`id`
IN (8432342, 2390102913, 2453245234523452)  [["man_id", 970345987]]
```
010bdec
@thedarkone thedarkone do not load all child records for inverse case
currently `post.comments.find(Comment.first.id)` would load all
comments for the given post to set the inverse association.

This has a huge performance penalty. Because if post has 100k
records and all these 100k records would be loaded in memory
even though the comment id was supplied.

Fix is to use in-memory records only if loaded? is true. Otherwise
load the records using full sql.

Fixes #10509
9f1f89b
@rafaelfranca rafaelfranca Merge pull request #11948 from thedarkone/backport-11049-11051-4-0-st…
…able

Backport #11049 and #11051 into 4-0-stable
a3bf24a
Commits on Aug 22, 2013
@senny senny Merge pull request #11943 from suginoy/ar-order-notation
Add examples of AR order method's hash notation to Rails Guide [ci skip]
5a99887
Commits on Aug 23, 2013
@senny senny Merge pull request #11991 from prathamesh-sonpatki/note-edge-guides
Add a note about edge guides in the feedback section [ci skip]
1960780
@rafaelfranca rafaelfranca Merge pull request #11967 from jetthoughts/add_action_controller_bug_…
…report_template

Added bug report template for ActionController
1c96c0b
@carlosantoniodasilva carlosantoniodasilva Merge pull request #11994 from rajcybage/fix_instance
remove not used instance variable
1daf1c1
@senny senny Merge pull request #11996 from semaperepelitsa/master
Docs: fix typo in file path, should include extension. [ci skip]
5608c90
Commits on Aug 26, 2013
@senny senny Merge pull request #11973 from prathamesh-sonpatki/nokogiri-warning
Add error message for including nokogiri in Gemfile for rake doc:guides
26ad789
@senny senny PG adapter deals with negative money values formatted with parenthesis.
Closes #11899.

Conflicts:
	activerecord/CHANGELOG.md

Backport of 27dc4fa.
fefb132
@rafaelfranca rafaelfranca :scissors:
[ci skip]
6da54c9
@rafaelfranca rafaelfranca Review Action Pack CHANGELOG
[ci skip]
7973742
@rafaelfranca rafaelfranca Review Active Record CHANGELOG
[ci skip]
b413c5a
@rafaelfranca rafaelfranca Review Active Support CHANGELOG
[ci skip]
d4d66c2
@rafaelfranca rafaelfranca Remove gist link from the code
It is not good to include links in the code. These links can be in the
future outdated and nobody will upgrade they.

[ci skip]
7bc2906
@senny senny Merge pull request #11997 from startupjockey/add_credits_AS
Adds Akshay Surve to Rails Guides credits list [ci skip]
e516f17
@senny senny fix typo in the credit section of the guides. [ci skip] a256a00
@steveklabnik steveklabnik Soften wording about knowing other devs.
Many people don't, so point them to a place where they can meet
some.
d79d87c
@steveklabnik steveklabnik Flesh out feedback portion of contributing guide.
I don't know of anyone that hangs out in #rails-contrib, and we should
also let people know that feedback can take some time.
72b471a
@steveklabnik steveklabnik Add note about features vs. bugs.
Sometimes people ask what makes a feature and what makes a bug, so
let's clarify that so we can show it to people later.
4cb91a1
@fedesoria fedesoria Warning on doc for assets under lib|vendor not precompiling [ci skip] 82b3b69
@tenderlove tenderlove Merge pull request #12037 from SamSaffron/mem_alloc
Performance: Reduce memory allocations in Active Record
cf4816e
Commits on Aug 27, 2013
@rafaelfranca rafaelfranca Review Action Mailer CHANGELONG
[ci skip]
cff4e3e
@rafaelfranca rafaelfranca Merge pull request #12038 from SamSaffron/memoize_decorate_cols
Perf: memoize serialized column list and time zone column list
e36692a
@urbanautomaton urbanautomaton Ensure all-caps nested consts marked as autoloaded
Previously, an autoloaded constant `HTML::SomeClass` would not be marked
as autoloaded by AS::Dependencies. This is because the
`#loadable_constants_for_path` method uses `String#camelize` on the
inferred file path, which in turn means that, unless otherwise directed,
AS::Dependencies watches for loaded constants in the `Html` namespace.

By passing the original qualified constant name to `#load_or_require`,
this inference step is avoided, and the new constant is picked up in the
correct namespace.

Conflicts:
	activesupport/CHANGELOG.md
94f44ee
@steveklabnik steveklabnik Merge pull request #12015 from vipulnsward/add_dynamic_finders_to_upg…
…rade

Add Finder API changes to upgrading guide [ci skip]
cd02e68
@rafaelfranca rafaelfranca Merge pull request #11805 from jetthoughts/11803_update_move_forbidde…
…n_exception_description_before_show

[Getting Started Guide] Move Forbidden attributes description before show post section [ci skip]
Conflicts:
	guides/source/getting_started.md
8f72b59
@rafaelfranca rafaelfranca Merge pull request #11768 from cloudspace/cache_template_loading
Only cache template digests if !config.cache_template_loading
Conflicts:
	actionview/CHANGELOG.md
b351c6f
@tenderlove tenderlove Merge pull request #12048 from tjouan/app_generator-bin_perms-umask
Comply with current umask when generating new app
ea01b54
Commits on Aug 28, 2013
@senny senny Merge pull request #10642 from LTe/invalid-load-error
Show real LoadError on helpers require
Conflicts:
	actionpack/CHANGELOG.md

Closes #12055.
78624ff
Commits on Aug 30, 2013
@carlosantoniodasilva carlosantoniodasilva Merge pull request #12076 from dabit/master
Fix broken link to Fixtures documentation on guides and activerecord tests [ci skip]
26eef6a
@kares kares use AR-JDBC (>=) 1.3.0 with AR 4.0 5dbd6b5
@spastorino spastorino Merge pull request #12085 from valk/master
FIX reload! within rails console --sandbox causes undefined method rollb...
1c6556f
Commits on Aug 31, 2013
@carlosantoniodasilva carlosantoniodasilva Merge pull request #12079 from kares/jdbc-1.3.0
use AR-JDBC (>=) 1.3.0 with AR 4.0
4c92851
Commits on Sep 02, 2013
@guilleiguaran guilleiguaran Merge pull request #11952 from lmarcetic/master
Remove set_primary_key, replace with primary_key=
8487692
Commits on Sep 03, 2013
@tenderlove tenderlove Merge pull request #11971 from freerunningtechnologies/dynamic_respon…
…d_to

Performance regression in AR::Base.respond_to?

Related with #12120

Conflicts:
	activerecord/test/cases/finder_respond_to_test.rb
420f9cb
@spastorino spastorino Revert "Merge pull request #12085 from valk/master"
This reverts commit 15455d7, reversing
changes made to ffa56f7.
025b63d
@tenderlove tenderlove Merge pull request #12065 from SamSaffron/result_optimisation
Perf: micro optimised Result column hash_row creation
e1314d8
Commits on Sep 05, 2013
@senny senny Merge pull request #12130 from egilburg/patch-1
Document a difference between pluck and select [ci skip]
1872409
@senny senny Merge pull request #12139 from vipulnsward/typos_av
Fix method name typos
79ffe9c
@carlosantoniodasilva carlosantoniodasilva Merge pull request #12143 from rajcybage/fixing_typos
fix actionview and activemodel test cases typos
116de97
Commits on Sep 06, 2013
@carlosantoniodasilva carlosantoniodasilva Merge pull request #12148 from gzohari/callback-typo
Fix typo in set_callback docs. [ci skip]
3b64d5b
Commits on Sep 11, 2013
@rafaelfranca rafaelfranca Merge pull request #12194 from thedarkone/readonly-merger-fix
Relation#merge should not lose readonly(false) flag.
Conflicts:
	activerecord/CHANGELOG.md
843e9c4
@rafaelfranca rafaelfranca Merge pull request #12185 from SamSaffron/join_dep
Reduce allocations when extracting AR models
463f989
@rafaelfranca rafaelfranca Merge pull request #12135 from dylanahsmith/avoid_empty_transaction
Avoid empty transaction from setting has_one association on new record.

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
9ec8f17
@tenderlove tenderlove Merge branch '4-0-stable' of github.com:rails/rails into 4-0-stable
* '4-0-stable' of github.com:rails/rails:
  Merge pull request #12135 from dylanahsmith/avoid_empty_transaction
  Merge pull request #12185 from SamSaffron/join_dep
  Merge pull request #12194 from thedarkone/readonly-merger-fix
  Merge pull request #12148 from gzohari/callback-typo
  Merge pull request #12143 from rajcybage/fixing_typos
  Merge pull request #12139 from vipulnsward/typos_av
  Merge pull request #12130 from egilburg/patch-1
f0c0505
@tenderlove tenderlove Merge pull request #12188 from SamSaffron/master
Perf: avoid dupes add fallback logic for coders
918a148
@rafaelfranca rafaelfranca Check if the SQL is not a prepared statement
When the adapter is with prepared statement disabled and the binds array
is not empty the connection adapter will try to set the binds values and
will fail. Now we are checking if the adapter has the prepared statement
disabled.

Fixes #12023

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
ecf3b00
@rafaelfranca rafaelfranca Remove invalid comment
This is not valid anymore after 08477a6
94b0acc
Commits on Sep 12, 2013
@rafaelfranca rafaelfranca Fix inverted conditional
Oops, I should had run the tests
08376d3
@carlosantoniodasilva carlosantoniodasilva Merge pull request #12205 from claudiob/remove-unused-raw-email-fixtures
Remove unused raw email fixtures
9a0d664
@carlosantoniodasilva carlosantoniodasilva Fix typo on instance variable get call 2de6936
@rafaelfranca rafaelfranca Disable prepared statements in the unprepared_statement block dab6cfb
@rafaelfranca rafaelfranca Add CHANGELOG entry for #11065
[ci skip]
89e2cef
@rafaelfranca rafaelfranca Add CHANGELOG entry for #11069
[ci skip]
f412b79
@rafaelfranca rafaelfranca Add CHANGELOG entry for #11440
[ci skip]
67bf4c6
@rafaelfranca rafaelfranca Add CHANGELOG entry for #11161
[ci skip]
cb1e3d4
@rafaelfranca rafaelfranca Add CHANGELOG entry for de20a6d
[ci skip]
377d77a
@rafaelfranca rafaelfranca Merge pull request #12206 from harshadsabne/master
Update 4_0_release_notes.md
Conflicts:
	guides/source/4_0_release_notes.md
6a418db
@rafaelfranca rafaelfranca Merge pull request #11603 from jetthoughts/join_strings_instead_of_co…
…ntactination

Cleanup: replace String concatenation by joining for excerpt helper

Conflicts:
	actionview/CHANGELOG.md
58ab79f
@rafaelfranca rafaelfranca Add CHANGELOG entry for #11603
[ci skip]
52170b3
@rafaelfranca rafaelfranca 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
d107a84
@rafaelfranca rafaelfranca Merge pull request #12159 from nashby/issue-12149
do not break params filtering on nil values
e6ca38f
@rafaelfranca rafaelfranca Merge pull request #12156 from rywall/from-copy-binds
Allow Relation#from to accept other relations with bind values.

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
0c366e2
@rafaelfranca rafaelfranca Merge pull request #11698 from dmathieu/sqlite_tasks_without_rails
Let the SQLite rake tasks run without rails
de2a561
Commits on Sep 13, 2013
@rafaelfranca rafaelfranca Merge pull request #12222 from rcillo/fix-custom-flash
Custom flash should be defined only for the class that defines it and it's subclasses

Fixes #12057
Conflicts:
	actionpack/CHANGELOG.md
1d03b5f
Commits on Sep 16, 2013
@steveklabnik steveklabnik Bring "Getting Started" in line with the code.
We removed `:to` in the code examples, but not in the
description. Whoops!

This has already been fixed on edge.

Closes #12246
0dfb51b
@rafaelfranca rafaelfranca Merge pull request #12011 from jetthoughts/11963_fix_join_with_associ…
…ation_scope

Collapse where constraints to the Arel::Nodes::And node

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
c8eb823
Commits on Sep 18, 2013
@rafaelfranca rafaelfranca Merge pull request #12276 from kennyj/fix_12269
Fix an issue where router can't recognize downcased url encoding path.
Conflicts:
	actionpack/CHANGELOG.md
b52b0be
Commits on Sep 20, 2013
@senny senny mention controller test base class in testing guide. [ci skip] e284059
@rafaelfranca rafaelfranca Merge pull request #12301 from Gazler/guide_3_0_release_notes_broken_…
…link

Documentation Fix: Remove broken link on rails 3 guide

Closes #12300
5af2be2
Commits on Sep 21, 2013
@rafaelfranca rafaelfranca Add back options argument in the ActiveRecord::Base.initialize method
This will make easier to hook protected_attributes gem in our code
without making that gem fragile to change in Rails code base.

Closes #12243
d8b1736
@rafaelfranca rafaelfranca Merge pull request #12311 from kennyj/fix_typo_about_uuid
Fix typo. This test isn't executed even in the postgresql.
fab8c3d
Commits on Sep 22, 2013
@rafaelfranca rafaelfranca Merge pull request #12281 from kennyj/add_doc_about_12276
[ci skip] Add some comment about downcase url encoded string.
4900ad4
@rafaelfranca rafaelfranca Merge pull request #10500 from kennyj/fix_10450
Fixed a bug in  when using has_many association with :inverse_of option and UUID primary key.

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
dfc2457
@rafaelfranca rafaelfranca Merge pull request #11382 from kennyj/fix_10751-2
Dump UUID default functions to schema.rb [2nd version]. Fixes #10751.

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
b02b67b
@rafaelfranca rafaelfranca Merge pull request #12317 from nashby/collection-label-namespace
handle `:namespace` form option in collection labels
Conflicts:
	actionview/CHANGELOG.md
21b000a
@pixeltrix pixeltrix Merge pull request #11474 from bogdan/time-with-zone-succ
Prevent server blow up when iterating over TimeWithZone Range
76e231e
Commits on Sep 23, 2013
@senny senny Merge pull request #12314 from JuanitoFatas/migrations
[ci skip] Add `null` type modifier in migrations.md.
5e480d2
@rafaelfranca rafaelfranca Merge pull request #12321 from bogdan/time-with-zone-succ
Changelog entry for pr #11474
Conflicts:
	activesupport/CHANGELOG.md
674e88a
@rafaelfranca rafaelfranca Merge pull request #12287 from bogdan/select-with-selected-option
Fix some edge cases for select with selected option
Conflicts:
	actionview/CHANGELOG.md
eb45805
@rafaelfranca rafaelfranca Fix the model name in the association basics guides
[ci skip]
82cae28
@rafaelfranca rafaelfranca Merge pull request #12325 from tjschuck/bcrypt_version_bump
Bump bcrypt-ruby version to support Ruby 2.0 on Windows
4b3eaec
Commits on Sep 24, 2013
@rafaelfranca rafaelfranca Merge pull request #12329 from benmanns/docrails
Update references to wycats/thor to erikhuda/thor.
d0c425b
@rafaelfranca rafaelfranca Merge pull request #12347 from macmartine/master
Fix typo in number_to_human docs: you -> your

[ci skip]
db7b311
@rafaelfranca rafaelfranca Merge pull request #12341 from odigity/master
added column type to example in section 2.3
Conflicts:
	guides/source/migrations.md

[ci skip]
a79f72e
@rafaelfranca rafaelfranca Merge pull request #12346 from graysonwright/patch-1
[Documentation] Add a missing validation to I18n docs
a31e91a
Commits on Sep 25, 2013
@rafaelfranca rafaelfranca Merge pull request #12344 from angelic/collection_check_boxes_with_name
Use the given name in html_options for the hidden field in collection_ch...
bea5e32
@rafaelfranca rafaelfranca Merge pull request #12359 from arthurnn/inverse_on_callbacks
Make sure inverse_of is visible on the has_many callbacks
Conflicts:
	activerecord/CHANGELOG.md
8fbc416
@rafaelfranca rafaelfranca Merge pull request #12362 from arthurnn/inverse_on_find
fix .find when inverse is loaded
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/associations/collection_association.rb
	activerecord/test/cases/associations/has_many_associations_test.rb
9c18c8c
@rafaelfranca rafaelfranca Merge pull request #12363 from jbaudanza/doc
Fix small typo in docs
983d883
Commits on Sep 26, 2013
@senny senny Merge pull request #12338 from JuanitoFatas/generator
[ci skip] Update scaffold output and change some words.
b224043
@rafaelfranca rafaelfranca Merge pull request #12376 from tvdeyen/cache-digests-rake-tasks
Adds template dependencies rake task from cache_digests gem.
Conflicts:
	actionpack/lib/action_view/railtie.rb
20e0d4d
Commits on Sep 27, 2013
@steveklabnik steveklabnik Merge pull request #11807 from jetthoughts/11804_actions_are_public_m…
…ethods

Add description of action in Getting Started Guide [ci skip]
8176006
Commits on Sep 29, 2013
@rafaelfranca rafaelfranca Merge pull request #11496 from jetthoughts/11376_has_many_assoc_respe…
…ct_scope_on_build

Removed where_values_hash from AR::NullRelation
Conflicts:
	activerecord/CHANGELOG.md
0a48cce
@thedarkone thedarkone Replace global Hash with TS::Cache.
Conflicts:
	actionpack/lib/action_dispatch/journey/visitors.rb
cf53a32
@thedarkone thedarkone Make GTG::TransTable thread safe.
From now on only the `[]=` method is allowed to modify the internal states hashes.
d62a95a
@rafaelfranca rafaelfranca Merge pull request #12354 from kennyj/fix_12293
Closes #12293. Strong parameters should permit nested number as key.
Conflicts:
	actionpack/CHANGELOG.md
d663c19
@rafaelfranca rafaelfranca Merge pull request #12400 from jaredbeck/fixes_guide_re_action_on_unp…
…ermitted_parameters

Fixes incorrect spelling of `action_on_unpermitted_parameters` in guide
3117fb6
@rafaelfranca rafaelfranca Merge pull request #12383 from marclennox/master
Fixed issue #12327
Conflicts:
	activerecord/test/cases/base_test.rb
6a67407
Commits on Sep 30, 2013
Tamir Duberstein make sure both headers are set before checking for ip spoofing
(cherry picked from commit ccd6f8b)

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
fbf5ece
Commits on Oct 01, 2013
@rafaelfranca rafaelfranca Revert "Merge pull request #10710 from senny/5554_let_the_database_ra…
…ise_on_counts"

This reverts commit b8e2978.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/calculations.rb

Reason: This change is not backward compatible and it was reverted
before 4.0.0 at 2ad168e so we can't include in 4-0-stable.

Closes #12417
682d7c7
@senny senny Merge pull request #12416 from sepastian/guides_configuring_initializ…
…ation_hooks

guides: configuring: fixing explanation of :after_initialize hook [ci skip]
d8aa91f
Commits on Oct 02, 2013
@senny senny Merge pull request #12418 from makaroni4/fix/ar_reload_doc_12101
Update AR reload doc for the case of manually set primary key attribute [ci skip]
efe9749
@matiaskorhonen matiaskorhonen Adds the Rails maintenance policy to the Guides
[ci skip]

Conflicts:
	guides/CHANGELOG.md
eb2017e
@fxn fxn copy-edits the new guide with our maintenance policy [ci skip] ceaf211
Commits on Oct 03, 2013
@senny senny Merge pull request #12430 from vipulnsward/changelog_fix
`intiantiated` => `instantiated` [ci skip]
4135e60
@senny senny Merge pull request #12431 from GRoguelon/master
Fix a typo in the code of Testing guide. [ci skip]
faaa57f
@sikachu sikachu Port test from cf1904f to avoid future regression
Related issue: #11939, #12084
0a26530
@tenderlove tenderlove Merge pull request #12436 from sikachu/4-0-stable-port-12084
Port test from cf1904f to avoid future regression
e59dac8
Commits on Oct 04, 2013
@arthurnn arthurnn add regression test for set_inverse_instance on add_to_target 6b49da3
Commits on Oct 05, 2013
@tenderlove tenderlove instrumenter can't be cached because the app could be called from
different threads.
64ba1ab
Commits on Oct 08, 2013
@senny senny Merge pull request #12463 from ulyssecarion/master
Call `rails plugin new yaffle` in the plugins guide. [ci skip]
9f5ec21
Commits on Oct 09, 2013
@senny senny Merge pull request #12473 from claudiob/document-after-touch
Add documentation for after_touch [ci skip]
582a90c
@senny senny Merge pull request #12283 from JuanitoFatas/rails-on-rack
[ci skip] Add explanation on Rack::Sendfile middleware in rails_on_rack.md.
cfd9186
Commits on Oct 10, 2013
@pixeltrix pixeltrix Respect `SCRIPT_NAME` when using `redirect` with a relative path
Example:
    # application routes.rb
    mount BlogEngine => '/blog'

    # engine routes.rb
    get '/admin' => redirect('admin/dashboard')

This now redirects to the path `/blog/admin/dashboard`, whereas before it
would've generated an invalid url because there would be no slash between
the host name and the path. It also allows redirects to work where the
application is deployed to a subdirectory of a website.

Fixes #7977
(cherry picked from commit 9dbd208)

Conflicts:
	actionpack/CHANGELOG.md
e45d965
@tjschuck tjschuck Use bcrypt's public cost attr, not internal constant b5e9027
@jeremy jeremy Merge pull request #12494 from tjschuck/bcrypt_cost_attr
Use bcrypt's public cost attr, not internal constant
c3fa44b
Commits on Oct 13, 2013
@senny senny `CollectionProxy#include?` returns `true` and `false` as documented. 2cd2432
@rafaelfranca rafaelfranca Merge pull request #12507 from malavbhavsar/doc_patch
Some fixes in docs [ci skip]
Conflicts:
	guides/source/active_record_basics.md
2d44771
@rafaelfranca rafaelfranca Merge pull request #11791 from versioncontrol/includes_with_persisten…
…t_select

Includes with persistent select, fixes #11773
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/finder_methods.rb
645e87f
@rafaelfranca rafaelfranca Merge pull request #12493 from drodriguez/patch-1
Keep code consistent with previous code blocks.
328431c
@rafaelfranca rafaelfranca Merge pull request #12491 from shamanime/patch-1
Fix wrong variable name used in the select_day method documentation
aa1e95e
@rafaelfranca rafaelfranca Merge pull request #12511 from jetthoughts/informative_raise_message_…
…for_incorrect_association

Make missed association exception message more informative
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/associations/preloader.rb
603d553
@rafaelfranca rafaelfranca Extract local variable to avoid method call cfbd4a4
@rafaelfranca rafaelfranca Merge pull request #12508 from jetthoughts/12415_generate_subqueries_…
…for_relation_from_binding_params

Generate subquery for Relation passed as array condition for where

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
ad13e22
Commits on Oct 14, 2013
@rafaelfranca rafaelfranca Dump the default function when the primary key is uuid
Fixes #12489
135557e
@rafaelfranca rafaelfranca Push default_function to superclass to avoid method check 9cd5f2e
@rafaelfranca rafaelfranca Extract a function to determine if the default value is a function 066a94a
@rafaelfranca rafaelfranca Merge branch 'default_function' into 4-0-stable 9c98535
@tenderlove tenderlove use arel rather than slapping together SQL strings 83cc36d
@senny senny Merge pull request #11880 from senny/backport_arel_fix
Backport arel fix
146132d
@senny senny cleanup changelog entry format. [ci skip]
Conflicts:
	activerecord/CHANGELOG.md
1366df2
@rafaelfranca rafaelfranca Merge pull request #9499 from dmitry/inverse_instance_should_not_be_r…
…eloaded_after_stale_state_change

Inversed instance should not be reloaded after stale state was changed

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
c2b10b7
@rafaelfranca rafaelfranca Merge pull request #10538 from neerajdotname/3882
scope_chain should not be mutated for other reflections
Conflicts:
	activerecord/CHANGELOG.md
885bc0b
@rafaelfranca rafaelfranca Merge pull request #12536 from sbagdat/patch-1
Remove size alias for length validation
885d4b1
Commits on Oct 15, 2013
@rafaelfranca rafaelfranca Merge pull request #12543 from route/missed_require
Add missed require making `enable_warnings` available
068b8cc
@rafaelfranca rafaelfranca Remove git dependecy from Gemfile 8355355
@rafaelfranca rafaelfranca Merge pull request #12547 from derekprior/dp-fix-null-relation-pluck
Pluck on NullRelation should accept a list of columns
Conflicts:
	activerecord/CHANGELOG.md
1658793
@rafaelfranca rafaelfranca Don't remove the select values to add they back again 0785008
Commits on Oct 16, 2013
@rafaelfranca rafaelfranca Merge pull request #12568 from adamyonk/patch-1
Fix typo in form_helper.rb
f96b383
@rafaelfranca rafaelfranca Merge pull request #12540 from wyaeld/bug/fix-recursive-digest
Ensure ActionView::Digestor.cache is correctly cleaned up

Conflicts:
	actionview/CHANGELOG.md
6fcad8c
@rafaelfranca rafaelfranca Ensure the state is clean after one failure 54f836e
@rafaelfranca rafaelfranca Revert "Don't remove the select values to add they back again"
This reverts commit 0785008.

Reason: MySQL tests are broken with this change because STI information
seems to be lost. We will apply a fix only on master for this.
1660f53
Commits on Oct 17, 2013
@rafaelfranca rafaelfranca Review the CHANGELOGs [ci skip] 181947b
@rafaelfranca rafaelfranca Release 4.0.1.rc1 3f2bc99
Commits on Oct 21, 2013
@rafaelfranca rafaelfranca Escape the parentheses in the default function regexp
This is causing every default value in PostreSQL database to being
handled as default function.

Fixes #12581
9a597ea
@rafaelfranca rafaelfranca Merge pull request #12588 from jetthoughts/12586_subquery_with_unprep…
…ared_sql

Inline bind values for sub-queries generated for Relation in where

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/sanitize_test.rb

Fixes #12586
ca8901f
@rafaelfranca rafaelfranca Release 4.0.1.rc2 3449a20
Commits on Oct 22, 2013
@rafaelfranca rafaelfranca Fix order dependent tests 86db9bc
Commits on Oct 23, 2013
@rafaelfranca rafaelfranca Merge pull request #12612 from amatsuda/amo_validates_inclusion_of_ti…
…me_range_error

Let validates_inclusion_of accept Time and DateTime ranges
fb49bca
@rafaelfranca rafaelfranca Preparing for 4.0.1.rc3 release b91f81c
@rafaelfranca rafaelfranca Fix the install task b7a495a
@rafaelfranca rafaelfranca Merge pull request #12619 from Veraticus/fix_utils_normalize_path
Correct error in Utils.normalize_path that changed paths improperly
dece340
Commits on Oct 30, 2013
@senny senny fix code typo in `MysqlAdapter` .Closes #12647.
Conflicts:
	activerecord/CHANGELOG.md
5d7e865
@rafaelfranca rafaelfranca Release 4.0.1.rc4 9466dad
Commits on Nov 01, 2013
@rafaelfranca rafaelfranca Preparing for 4.0.1 release 5505c1d