Skip to content
This repository
  • 10,000 commits
  • 260 files changed
  • 14 comments
  • 61 contributors
This comparison is big! We're only showing the most recent 250 commits
Apr 03, 2014
Rafael Mendonça França Merge pull request #14572 from laurocaetano/with_options_and_scope
Fix error when using `with_options` with lambda.

Conflicts:
	activerecord/CHANGELOG.md
ae110ce
Arthur Nogueira Neves Block a few default Class methods as scope name.
Add tests to make sure scopes cannot be create with names such as:
private, protected, public.
Make sure enum values don't collide with those methods too.
815c9de
Rafael Mendonça França Merge pull request #14582 from arthurnn/blacklist_ruby_methods
Blacklist ruby keywords for scopes
362203e
tgxworld Prevent state leak in test.
This will allow us to run the tests in random order.
20181e4
Apr 04, 2014
Yves Senn PostgreSQL and SQLite, remove varchar limit. [Vladimir Sazhin & Toms …
…Mikoss & Yves Senn]

There is no reason for the PG adapter to have a default limit of 255 on :string
columns. See this snippet from the PG docs:

    Tip: There is no performance difference among these three types, apart
    from increased storage space when using the blank-padded type, and a
    few extra CPU cycles to check the length when storing into a
    length-constrained column. While character(n) has performance
    advantages in some other database systems, there is no such advantage
    in PostgreSQL; in fact character(n) is usually the slowest of the
    three because of its additional storage costs. In most situations text
    or character varying should be used instead.
f4226c3
Yves Senn test, show current adapter behavior for `add_column limit: nil`.
This is an illustration of #13435 (comment)
Removing the limit from the PG and SQLite adapter solves the issue.
MySQL is still affected by the issue.
80f4a65
Yves Senn Merge pull request #14593 from tgxworld/fix_postgresql_schema_test_ra…
…ndom_order

Prevent state leak in test.
f50dbf3
Matthew Draper Ensure we supply Kernel#y for 1.9 too
In 1.9, it doesn't live in its own file, so we'll have to define it
ourselves.

Check RUBY_VERSION, instead of rescuing the require, because we want
this to break if `psych/y` moves in a future Ruby release.
b058897
Rafael Mendonça França Merge pull request #14597 from matthewd/kernel_y_for_1_9_option_1
Ensure we supply Kernel#y for 1.9 too
d68e1ba
Rajarshi Das Active support instead of ActiveSupport::Deprecation.silence we can u…
…se assert_deprecated
996658e
Rafael Mendonça França Merge pull request #14598 from rajcybage/assert_dprecated_for_as_test…
…_case

Active support instead of ActiveSupport::Deprecation.silence we can use assert_deprecated
32f3f8f
Rafael Mendonça França Remove unused variable b9774a5
Rafael Mendonça França Merge pull request #12016 from roderickvd/uuid_fixes
Auto-generate stable fixture UUIDs on PostgreSQL

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/fixtures.rb
	activerecord/test/cases/adapters/postgresql/uuid_test.rb
	activesupport/CHANGELOG.md
54d8c81
Steve Agalloco add missing parentheses to validates_with documentation [skip ci] e412ccb
Arthur Nogueira Neves Merge pull request #14599 from spagalloco/patch-1
add missing parentheses to validates_with documentation [skip ci]
edb6f7d
Rafael Mendonça França Merge pull request #14562 from jefflai2/collection_proxy
CollectionProxy uses the arel of its association's scope.

Conflicts:
	activerecord/CHANGELOG.md
5f1346b
Rafael Mendonça França Make possible to use sprockets-rails 2.1 a338b39
Rafael Mendonça França Use sass-rails 4.0.3 61a8fd5
Rafael Mendonça França Declare the assets dependency bc6a949
Rafael Mendonça França Merge pull request #11650 from prathamesh-sonpatki/rename
Renamed private methods _create_record and _update_record
e9e5341
Rafael Mendonça França Add CHANGELOG entry for #11650 [ci skip] 989cccd
Rafael Mendonça França Fix the test defining the models in the right place 57c7d5c
Rafael Mendonça França sprockets-rails was released f79881e
Rafael Mendonça França Merge pull request #14579 from senny/pg/remove_string_limit
PostgreSQL, remove varchar limit.

Conflicts:
	activerecord/CHANGELOG.md
8d1c703
Apr 05, 2014
Andy Callaghan W3C CSP document moved to gihub.io URL [ci skip]
The old link https://dvcs.w3.org/hg/content-security-policy/raw-file/tip/csp-specification.dev.html is now being soft redirected to this new URL
3779c1d
Arthur Nogueira Neves Merge pull request #14612 from acallaghan/patch-1
W3C CSP document moved to gihub.io URL [ci skip]
c45939e
Apr 06, 2014
Dmitry Mazuro Use SVG version of travis build status badge [skip ci] 752e7a1
Yves Senn Merge pull request #14623 from t3chnoboy/master
Use SVG version of travis build status badge [ci skip]
baa9b9b
tgxworld Fix setup of adding _flash_types test.
Adding flash types to a controller within any of the tests will result
in a global state change of the controller under test.

This patch will prevent state leaks and allow us to run the test in random order.
8bbaa94
Yves Senn Merge pull request #14614 from tgxworld/fix_add_flash_types_test
Fix setup of adding _flash_types test.
5ac58be
Eileen M. Uchitelle fix CollectionProxy delete_all documentation
This method no longer returns an array of all records that
have been removed. Correct documentation to reflect this change.

See issue 14546
9534006
Arthur Nogueira Neves Merge pull request #14626 from eileencodes/fix_incorrect_collection_p…
…roxy_delete_all_documentation

fix CollectionProxy delete_all documentation
39a54c6
Apr 07, 2014
Jarmo Isotalo Added OS X specific commands to installation guide [ci skip]
Recommended using homebrew for installing MySQL and PostgreSQL
2bc0271
Vipul A M Remove unused `subclass_controller_with_flash_type_bar` var from flas…
…h test.
a44d710
Yves Senn Merge pull request #14624 from jamox/dev_install_guide
Added OS X specific commands to installation guide [ci skip]
89ca9dd
Yves Senn Merge pull request #14628 from vipulnsward/remove-flash-test-warning
Remove unused `subclass_controller_with_flash_type_bar` var from flash test.
67e6706
Evan Whalen make enums distinct per class bbe7fe4
Rafael Mendonça França Merge pull request #14609 from evanwhalen/enums_inheritance
Make enums distinct per class
013b7c1
Lauro Caetano Ignore order when doing count.
This is necessary because Postgresql doesn't play nice with ORDER BY and
no GROUP BY.

Fixes #14621.
bbad752
Santiago Pastorino Merge pull request #14631 from laurocaetano/fix_count_with_order
Ignore order when doing count.
83e9e19
Rafael Mendonça França Merge pull request #14632 from matthewd/escape_bytea
Use connection-specific bytea escaping
6bbbe0b
Lauro Caetano Build the reverse_order on its proper method.
The reverse_order method was using a flag to control if the order should
be reversed or not. Instead of using this variable just build the reverse order
inside its proper method.

This implementation was leading to an unexpected behavior when using
reverse_order and then applying reorder(nil).

Example:
  Before
    Post.order(:name).reverse_order.reorder(nil)
    # => SELECT "posts".* FROM "posts"   ORDER BY "posts"."id" DESC

  After
    Post.order(:name).reverse_order.reorder(nil)
   # => SELECT "posts".* FROM "posts"
6c311e0
Carlos Antonio da Silva Remove useless begin..end 70c83f4
Eileen M. Uchitelle remove check for present? from delete_all
Passing in a blank string is a bug so there's no reason
to check for a blank string.
2512bd7
Rafael Mendonça França Rails.application should be set inside before_configuration hook
Fixes #14620
e1404ec
Rafael Mendonça França Merge pull request #14635 from eileencodes/remove-check-for-present
remove check for present? from delete_all method
9575c82
Rafael Mendonça França Merge pull request #14634 from laurocaetano/fix_reorder
Build the reverse_order on its proper method.
3f5eb59
Godfrey Chan Follow up to bbe7fe4 to fix enum leakage across classes.
The original attempt didn't really fix the problem and wasn't testing the
problematic area. This commit corrected those issues in the original commit.

Also removed the private `enum_mapping_for` method. As `defined_enums` is now a
method, this method doesn't provide much value anymore.
a5664fe
Godfrey Chan Ensure we are looking with string keys 77692ff
Apr 08, 2014
Matthew Draper Use connection-specific bytea escaping
In our normal usage, it's rare for this to make a difference... but is
more technically correct.

As well as a spec that proves this is a good idea, let's also add a more
sane-looking one that just covers basic to_sql functionality. There
aren't many places where we actually use escape_bytea, but that's one
that won't be going away.
c4bdca1
Matthew Draper Only apply DATABASE_URL for Rails.env
As we like ENV vars, also support DATABASE_URL_#{env}, for more obscure
use cases.
2b817cd
Rafael Mendonça França Make sure DEFAULT_URL only override current environment database
configuration
e533826
Rafael Mendonça França Test DATABASE_URL has precendance over DATABASE_URL_#{environment} d459f75
Rafael Mendonça França Only call DEFAULT_ENV proc one time 2b6d1da
Rafael Mendonça França Check env_url only once d035ba1
Rafael Mendonça França entry is always a Hash 0ec0475
Matthew Draper Rearrange the config merger some more
This seems to simplify the operative part. Most importantly, by
pre-loading all the configs supplied in ENV, we ensure the list is
complete: if the developer specifies an unknown config, the exception
includes a list of valid ones.
de9f2f6
Matthew Draper Give a deprecation message even when the lookup fails
If the supplied string doesn't contain a colon, it clearly cannot be a
database URL. They must have intended to do a key lookup, so even though
it failed, give the explanatory deprecation warning, and raise the
exception that lists the known configs.

Conveniently, this also simplifies our logical behaviour: if the string
matches a known configuration, or doesn't contain a colon (and is
therefore clearly not a URL), then we output a deprecation warning, and
behave exactly as we would if it were a symbol.
2369218
Matthew Draper Ensure we correctly and immediately load all ENV entries
.. even when the supplied config made no hint that name was relevant.
8f23c22
Rafael Mendonça França Merge pull request #14633 from matthewd/narrow_database_url
Only apply DATABASE_URL for Rails.env
75e0ee8
David Rodríguez Keep debugger support only for rubies < 2.0.0 7901ae1
David Rodríguez Update Gemfile templates to provide correct debugger d8a4e48
David Heinemeier Hansson Use short-form for the scaffold render calls and drop the needless test 4b0c8a9
David Rodríguez Update debugging guide to use byebug eb2d555
David Heinemeier Hansson Dont encourage aliases now that we have variants 10570cf
David Heinemeier Hansson Dont abbreviate that which needs no abbreviation 304d2f1
Matias Korhonen Updates the maintenance policy with new Rails versions f0125a1
Rafael Mendonça França Merge pull request #14647 from matiaskorhonen/updates-maintenance-policy
Updates the maintenance policy with new Rails versions
c28742f
Rafael Mendonça França new CHANGELOGs entries are in the top [ci skip] 30a41e7
Emily Dobervich Fixed problem where `1.day.eql?(1.day)` is false
This fixes:
    1.second.eql?(1.second) #=> false

The new `eql?` requires that `other` is an `ActiveSupport::Duration`.
This requirement makes `ActiveSupport::Duration`'s behavior consistent
with other numeric types in Ruby.

    1.eql?(1.0) #=> false
    1.0.eql?(1) #=> false

    1.second.eql?(1) #=> false (was true)
    1.eql?(1.second) #=> false

    { 1 => "foo", 1.0 => "bar" }
    #=> { 1 => "foo", 1.0 => "bar" }

    { 1 => "foo", 1.second => "bar" }
    # now => { 1 => "foo", 1.second => "bar" }
    # was => { 1 => "bar" }

And though the behavior here hasn't changed, for reference:

    1 == 1.0 #=> true
    1.0 == 1 #=> true

    1 == 1.second #=> true
    1.second == 1 #=> true
5aeb3cd
Guillermo Iguaran Merge pull request #14652 from Emily/duration_eqls
Fixed problem where `1.day.eql?(1.day)` is false
aff37a9
Expand explanation of how to set secrets.yml. [ci skip] a4e5587
Apr 09, 2014
Matthew Draper Less ambition, more deprecation
The "DATABASE_URL_*" idea was moving in the wrong direction.

Instead, let's deprecate the situation where we end up using
ENV['DATABASE_URL'] at all: the Right Way is to explicitly include it in
database.yml with ERB.
615e0dc
Matthew Draper Don't deprecate after all 88cd65b
Matthew Draper Drop in @jeremy's new database.yml template text
In passing, allow multi-word adapters to be referenced in a URL:
underscored_name must become hyphened-name.
d72a0cb
Vadim Golub Guides: minor typo fixed [ci skip] fec69b9
Arun Agrawal Merge pull request #14653 from vdmgolub/patch-1
Guides: minor typo fixed in Asset Pipeline guide
e117829
Yves Senn upgrading section for 4.1 is no longer WIP. [ci skip] 7cf46ad
Rafael Mendonça França Merge pull request #14654 from Alamoz/secret_key
Expand explanation of how to set secrets.yml.
040a1db
Rafael Mendonça França depend_on_asset is not required anymore on sprockets-rails 2.1.2 b053a47
Lucas Mazza Add missing require so requiring `active_support/cache` works again. 0645a1a
Rafael Mendonça França Merge pull request #14667 from lucasmazza/require-per-thread-registry
Add missing require so requiring `active_support/cache` works again.
7142ff8
Andriel Nuernberg Avoid URI parsing
This parsing is unecessary once the Request object already has the
needed information.
85e424d
Rafael Mendonça França Merge pull request #14665 from andrielfn/avoid-uri-parsing
Avoid URI parsing
7b75b67
Lauro Caetano The `source` option for `has_many => through` should accept String
values.

With the changes introduced by 16b70fd
it was expecting the value to be a Symbol, while it could be also a
String value.
a91e5ff
Aaron Patterson Merge pull request #14668 from laurocaetano/source_option_with_string…
…_value

The :source option for has_many => through should accept String values.
1368311
Arthur Nogueira Neves add services: memcache to travis 45195b3
Rafael Mendonça França Merge pull request #14671 from arthurnn/travis_memcache
add services: memcache to travis
c7d009b
Lauro Caetano Make the reflections cache work with strings as its keys. 1f31488
Lauro Caetano No need to call `to_sym` on reflection name, since the cache now works
with strings with string keys.

Related #14668.
4c6ba74
Lauro Caetano Make the aggregate_reflections cache work with strings as its keys. e7630b6
Lauro Caetano Make sure the reflection test is passing a String to the reflection
cache.
213ef56
Aaron Patterson Merge pull request #14675 from laurocaetano/make_reflection_caches_wo…
…rks_with_string_keys

Make reflection and aggregate_reflection caches work with string keys.
82cb477
Carlos Antonio da Silva Remove extra collect call cf0e44c
Carlos Antonio da Silva Only call uniq on the conditional that actually needs it 9a8af0c
Aaron Patterson Merge pull request #11411 from dscataglini/master
Active support callback's before/after/around filters are not correctly making their singleton methods private
febfc57
Apr 10, 2014
Akira Matsuda +EOL bb63e9c
Parth Bharadiya Correct factual error for page not found 3fe7b5f
Yves Senn Merge pull request #14679 from pbharadiya/master
Correct factual error for page not found [ci skip]
d8d0fcb
James Coglan Add a failing test for a URL helper that was broken by a6b9ea2. 77252c3
David Rodríguez Isolate debugger related code 6fae9ac
David Rodríguez Prevent generation of extra whitespace in templates 7fe49a4
Juanito Fatas [ci skip] Update code snippets to latest master (initialization.md).
Also update the `server.run` example (Replace Mongrel with Puma).
3664e3a
Simon Woker Fix error for aggregate methods with select, see issue #13648 afd4d82
Rafael Mendonça França Merge pull request #14677 from JuanitoFatas/update-initialization-cod…
…e-snippets

[ci skip] Update code snippets to latest master (initialization.md).
85b48d2
Rafael Mendonça França Merge pull request #11656 from emre-basala/xml_mini_test
Add tests to ActiveSupport:XmlMini to_tag method
6e9af5c
Rafael Mendonça França Require action_controller before any other action_controller file
This will load properly the loading hooks.

Closes rails/sass-rails#205
53610e5
Rafael Mendonça França Merge branch 'master' into rm-uuid-fixtures
Conflicts:
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md
085ce4f
Rafael Mendonça França No need to call send 7edb204
Rafael Mendonça França Merge branch 'rm-uuid-fixtures' ea2c31e
Rafael Mendonça França Remove warning of unused variable 1938c96
Kyle Heironimus Add after_commit/after_rollback to callback list
Adding after_commit/after_rollback to list of callbacks in order helps
explain the callback order as well as making it consistent with the API
docs at http://api.rubyonrails.org/classes/ActiveRecord/Callbacks.html
16f481b
Rafael Mendonça França Merge pull request #14695 from akshay-vishnoi/doc_changes
[ci skip] Remove false documentation
167e6da
Rafael Mendonça França Merge pull request #14694 from heironimus/callback_guide
Add after_commit/after_rollback to callback list
632d9d2
Rafael Mendonça França 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
a7a180b
Apr 11, 2014
Akshay Vishnoi [ci skip] Remove false documentation 8c1406c
Yves Senn docs, make association `autosave: true` examples runnable. Closes #14700
[ci skip]

The examples are written in a way you expect them to be executable.
However one snippet assumed there to be two comments when only one
was created above.

The defined models did not extend `ActiveRecord::Base`

The example used `comments.last.mark_for_destruction`. This does no
longer load the whole collection but just the last record. It is
then refetcht on subsequent calls to `last`. This breaks the example.
856ffbe
David Rodríguez Minor fixes in the rails debugging guide 8834847
Yves Senn PostgreSQL, adapter automatically reloads it's type map. Closes #14678.
[Yves Senn & Matthew Draper]
0c9bbc6
Yves Senn PostgreSQL, warn once per connection per missing OID. Closes #14275.
[Yves Senn & Matthew Draper]
9f62344
Winston Implement fuzzy matching for route search on routing error html page. 976495c
Winston Improve CSS styling for routing error html page. 2ad5dad
Winston Split search results into 'exact matches' and 'fuzzy matches'.
- also refactored the javascript.
14391d7
Andrew White 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.
e10f26f
Andrew White 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.
1424482
David Rodríguez Re-review the debugging guide.
Tested on a brand new app to exactly match current byebug's behaviour.
545afc1
Akshay Vishnoi Add more test case for #demodulize, Improve documentation 075a1e2
Rafael Mendonça França Merge pull request #14705 from akshay-vishnoi/doc_changes
Add more test case for #demodulize, Improve documentation
d0b5484
Matthew Draper Move assets precompile (and version) to an initializer
sprockets-rails 2.1 needs the precompile list to be available in all
environments.
f612c2b
Jano Suchal Be explicit about allowed constraint values, fixes #14702 aca64fe
Yves Senn Merge pull request #14692 from senny/pg/reload_type_map_for_unknown_t…
…ypes

PostgreSQL automatic type map reload
d91117f
Rafael Mendonça França Merge pull request #14707 from minio-sk/fix-issue-14702
Be explicit about allowed constraint values, fixes #14702
08775e3
Rafael Mendonça França Merge pull request #14619 from winston/enhance-routing-error-html
Enhance routing error html page
3abed7f
Rafael Mendonça França Add CHANGELOG entry for #14619 [ci skip] f1a4f0a
Rafael Mendonça França Merge pull request #14689 from matthewd/asset_initializer
Move assets precompile (and version) to an initializer
f166f1d
Rafael Mendonça França Fix version indicator on guides and link to Rails 4.0 [ci skip] 4e9c0b7
Rafael Mendonça França Merge pull request #14646 from deivid-rodriguez/provide_byebug_by_def…
…ault

Improve debugging support
7bb8fd2
Simon Woker fix exception on polymorphic associations with predicates 70fffac
Rafael Mendonça França Merge pull request #14711 from swoker/activerecord_fix_aggregate_meth…
…ods_with_select

Activerecord fix aggregate methods with select
d447eef
Rafael Mendonça França :scissors: 8a08f5c
Rafael Mendonça França New CHANGELOG entries are in to top of file bf98261
Rafael Mendonça França Use assert_not 8d11fbf
Rafael Mendonça França Merge branch 'rm-fix-13648'
Includes #14711 and some cleanup
commits.

Fixes #13648
c8a7066
Lauro Caetano The comparison between `Relation` and `CollectionProxy` should be con…
…sistent.

Example:

    author.posts == Post.where(author_id: author.id)
    # => true
      Post.where(author_id: author.id) == author.posts
    # => true

Fixes #13506
d6840f9
Aaron Patterson please use Ruby, not ActiveSupport e533855
Apr 12, 2014
Vipul A M Change links to 37signals and svn blog to point to new destinations. …
…[ci skip]
73bfb51
Robin Dupret Merge pull request #14717 from vipulnsward/change-37signal-links
Change links to 37signals and svn blog to point to new destinations. [ci skip]
fd56a78
Lauro Caetano Make the comparison between 'Relation' and 'AssociationRelation'
consistent.
24052f9
Lauro Caetano Ensure that the comparison between 'CollectionProxy' and 'Association…
…Relation' is consistent.
783982a
Aaron Patterson remove branching logic from calls to find_nth 0405d5a
Aaron Patterson only add the offset and index when we need to 8c2b79d
Aaron Patterson don't bother with an offset if the offset is zero
we're guaranteed to pass a numeric value for offset, so if it's zero,
just don't add an offset to the query
711a882
Phil Ross Bundle tzinfo-data on :x64_mingw (64-bit Ruby on Windows). c8ccab0
Rafael Mendonça França Merge pull request #14720 from philr/tzinfo_data_x64_mingw
Bundle tzinfo-data on :x64_mingw (64-bit Ruby on Windows).
76fcbf3
Robin Dupret Fix a few typos [ci skip]
This is a follow up to 545afc1.
80d0dd5
Mauro George CollectionHelpers now accepts a readonly option dfac1b1
Afshin Mokhtari Missing 'are' in note - [ci skip]
This is in the note at the end of Section 2: Controller Naming Convention.  [ci skip]
7782fdc
Richard Schneeman Merge pull request #14725 from afshinator/patch-1
Missing 'are' in note - [ci skip]
47d9321
Apr 13, 2014
Akshay Vishnoi Move tests for deep_dup and duplicable to object directory d815ca2
Robin Dupret Add a changelog entry for #14546 [ci skip] 5d5becc
Marcus Stollsteimer Remove surplus period from assertion messages 8c81c9c
Marcel Morgan Update documentation to use Rails.application instead
References to ``AppName::Application` removed in favour of ``Rails.application``
as generated with a new rails 4.1 app.

[ci skip]
2ddbe87
Yves Senn Merge pull request #14727 from robin850/patch-17
Add a changelog entry for #14546 [ci skip]
090db0f
Santiago Pastorino Merge pull request #14718 from mcmorgan/update-documentation-to-match…
…-generated-config

Update documentation to use Rails.application instead
8b3ff37
Santiago Pastorino Merge pull request #14722 from maurogeorge/mg-readonly-collection
CollectionHelpers now accepts a readonly option
b502fcc
Rafael Mendonça França Merge pull request #14726 from akshay-vishnoi/structural-change
Move tests for deep_dup and duplicable to object directory
bae857b
Rafael Mendonça França 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
0bccde9
Akshay Vishnoi [ci skip] Improve doc, fix grammatical issue e753148
Juanito Fatas [ci skip] Use plain underscore instead of "\_". 982a19e
Jean Boussier Write the failing test case for concurrent counter cache dd063f6
Jean Boussier Make counter cache decrementation on destroy idempotent 655a366
Robin Dupret Merge pull request #14732 from JuanitoFatas/doc/patch1
[ci skip] Use plain underscore instead of "\_". [ci skip]
2c21e6a
Nick Borromeo Disable assest cache store in docs [ci skip] 0debba8
Arthur Nogueira Neves Merge pull request #14737 from nickborromeo/disable-asset-cache-docs
Disable assest cache store in docs [ci skip]
4baa866
Aaron Patterson read_attribute is public, so we should just call it feb88bd
Aaron Patterson again, read_attribute is public, so just call it af549a1
Apr 14, 2014
Christopher Owen - Fix lingering reference to `:text` instead of the newer `:plain`
- Section references `form_tag` instead of the `form_for` used in the example
0e9fab5
Lauro Caetano Just call read_attribute, no need to use `send`.
Follow up to af549a1
a16f330
Rafael Mendonça França Merge pull request #14740 from laurocaetano/read-attribute
Just call read_attribute, no need to use send.
6c002ba
Yves Senn Merge pull request #14739 from oysta/guide-fixes
Fix some inconsistent references between text and example code in getting started guide [ci skip]
97b5253
Yves Senn 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.
2e000ab
Vlad Bokov Display diagnostics in text format for xhr request 59dbf68
Vasiliy Ermolovich `collection_check_boxes` respects `:index` option for the hidden file…
…d name.

closes #14147
3964bbc
Rafael Mendonça França Merge pull request #14736 from nashby/hidden-index
`collection_check_boxes` respects `:index` option for the hidden filed name
d40d392
Rafael Mendonça França Use the index on hidden field 3842645
zenati [ci skip] Added link to ruby-lang.org installation. 1497529
Yves Senn Merge pull request #14746 from zenati/master
Reference and link to install RVM in the Getting Started Guide. [ci skip]
3bf8f8b
Marcus Stollsteimer Refine tests for assert_select failure messages ce6f472
tgxworld Fix subscriptions not being unsubscribed. 26ff72f
Aaron Patterson Merge pull request #14735 from byroot/idempotent-counter-caches
Idempotent counter caches, fix concurrency issues with counter caches
a1e2db2
Joost Baaij Remove wrapping div with inline styles for hidden form fields.
We are dropping HTML 4.01 and XHTML strict compliance since input
tags directly inside a form are valid HTML5, and the absense of
inline styles help in validating for Content Security Policy.
89ff1f8
Jean Boussier Use inheritance chain instead of callbacks to increment counter cache…
…s after create
109d1b2
Jean Boussier Use inheritance chain instead of callbacks to increment counter cache…
…s after destroy
7e28b4e
Richard Schneeman Merge pull request #14729 from akshay-vishnoi/doc_changes
[ci skip] Improve doc, fix grammatical issue
c52a84f
Rafael Mendonça França Remove outdated comment ed6894b
Rafael Mendonça França 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

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/test/controller/mime/respond_with_test.rb

Conflicts:
	actionpack/CHANGELOG.md
4d21e49
Rafael Mendonça França :scissors: e8c6628
Rafael Mendonça França Make console and generators blocks works at Application instance level
Like rake tasks and runner blocks these blocks should also being shared
between applications since they are stored at the classes.

Fixes #14748
43f5250
Lauro Caetano The Association Relation should use `empty?` and `size` from Relation.
968c581 have introduced this bug #14744
on Association Relation when the method `empty?` or `size` was called.

Example:
  # Given an author that does have 3 posts, but none of them with the
  # title 'Some Title'
  Author.last.posts.where(title: 'Some Title').size
  # => 3

It was occurring, because the Association Relation had implemented these
methods based on `@association`, this way giving wrong results.

To fix it, was necessary to remove the methods `empty?` and `size` from
Association Relation. It just have to use these methods from Relation.

Example:
  # Given an author that does have 3 posts, but none of them with the
  # title 'Some Title'
  Author.last.posts.where(title: 'Some Title').size
  # => 0
  # Now it will return the correct value.

Fixes #14744.
34945e4
Lauro Caetano Make sure the column_name is different from 'all'.
968c581 have fixed the EagerLoadTest, but
not in the correct way.

The problem was when `empty?` or `size` was called on relation. It was
triggering `count(:all)`, which was passing `:all` as the column name to `count`
on Calculations.

On the other hand, the method `calculate` on Calculations was calling
`construct_relation_for_association_calculations` instead of `perform_calculation`,
because `has_include?` was returning `true` since `column_name` was present.

To prevent calling the wrong method to perform the calculation, we have to check
if the `column_name` is present and if it is different from `:all` (which is now used
to correctly do `count` with `select`).

More information here: 968c581#commitcomment-6006135
a9416a4
Apr 15, 2014
Yves Senn Merge pull request #14642 from tgxworld/fix_notifications_not_unsubsc…
…ribing

Fix subscriptions not being unsubscribed.
ab529c8
Yves Senn Merge pull request #14728 from stomar/assertion-msg
Remove surplus period from assertion messages
8167807
Juanito Fatas [ci skip] Add missing end in one of the examples in Migrations.md. 2e57d51
Yves Senn Merge pull request #14758 from JuanitoFatas/migrations-md
[ci skip] Add missing end in one of the examples in Migrations.md.
a230530
Rob use YAML.load_file in database tasks example
rather than YAML.load(File.read(path)). YAML.load_file is also used in
guides/rails_guides/helper.rb since 2011, the only other precedent I could find.
b335def
Rafael Mendonça França Merge pull request #14756 from laurocaetano/fix-count-on-association-…
…relation

Fix count on association relation (calls to empty and size).
5a0d804
Arthur Nogueira Neves Merge pull request #14762 from dwo/master
use YAML.load_file in database tasks example
ccdea7b
Rafael Mendonça França Merge pull request #14745 from razum2um/plain-text-diagnostics
Display diagnostics in text format for xhr request
3fce111
Jean Boussier Set _after_create_counter_called flag to make update counter cache work 5e32f97
Tim Linquist Provide interface for accessing underlying IO object
In some cases users may need to work with/manipulate more of the
Tempfile api than provided by Upload. Allow users to get at the
underlying io via the common to_io method of IO/IO-like objects
e601728
Jean Boussier Restore the destroy_by_association check in post destroy counter cache d254341
Jean Boussier Hide BelongsToAssociation#increment_counters and #decrement_counters 7af987c
eric-chahin Changed change_column in PG schema_statements.rb to make sure that th…
…e uuid_generate function was not being quoted.
eaa3949
Rafael Mendonça França Merge pull request #14766 from eric-chahin/migration_bug
Changed change_column in PG schema_statements.rb to make sure that the u...
3870ce0
Rafael Mendonça França Merge pull request #14765 from byroot/refactor-counter-cache-create-a…
…nd-destroy

Refactor counter cache create and destroy
e482696
Rafael Mendonça França Add CHANGELOG entry for #14766 [ci skip] f02393c
Yury Velikanau Update AC::Metal documentation example [ci skip]
Include proper module since AV was extracted form AP as mentioned in #14659.
5f11d13
Rafael Mendonça França Merge pull request #14768 from spectator/ac_metal_docfix
Update AC::Metal documentation example
a21fae7
Rafael Mendonça França Merge pull request #14733 from akshay-vishnoi/test-cases
Improve tests for duplicable, remove unnecessary constant
e665ce7
Mike MacDonald [ci skip] Avoid suggesting dangerous code in i18n guide
Calling `to_sym` on user input opens apps up to Denial of Service attacks, via the symbol table being expanded to consume vast swathes of memory.

It is a fairly common configuration to have DNS configured such that all subdomains route to your Rails app, in which case an attacker visits `www1.foo.com`, `www2.foo.com`, and so on until something gives.

It is far less likely to have this problem with TLDs, so that change was only for consistency.
19b2bcc
Rafael Mendonça França Merge pull request #14770 from crazymykl/avoid_dos_vuln_in_i18n_guide
Avoid suggesting dangerous code in i18n guide
d46771b
Apr 16, 2014
Akshay Vishnoi Object#duplicable?
1. Improve tests
2. Remove unnecessary constant
3. Add docs for BigDecimal#duplicable?
e120d21
Rob Gilson SQL Like escaping helper method. [Rob Gilson & Yves Senn]
Closes #14222.

This is a follow up to #6104

This does not have the backwards compatibility issues brought up in
implementation to break.
fe4b0ee
eric-chahin Changed the NullRelation so that when count is called with #group it …
…will properly return an empty hash instead of zero. Fixes issue #14721

Conflicts:
	activerecord/CHANGELOG.md
93f8525
Arthur Nogueira Neves Merge pull request #11836 from mcfiredrill/engines-testing-doc
additional note about routes in functional tests for engines [ci skip]
fa83601
Yves Senn `sanitize_sql_like` escapes `escape_character` not only backslash.
* This is a follow up to: fe4b0ee
* The originating PR is #14222
* It should fix the build
973a452
Yves Senn Merge pull request #14773 from eric-chahin/null_relation_fix
Changed the NullRelation so that when count is called with #group it wil...
c1dc647
Kyle Heironimus [skip ci] Reorder i18n guide
Currently, the section called "How to store your custom translations"
has several subheadings that make no sense, such as "Translations for
ActiveRecord models." These make more sense under the "Overview of the
I18n API Features" section. I moved the "How to store..." section down
to the more appropriate sub-headings "Using Different Backends" and
"Using Different Exception Handlers" and removed the "Customize your
i18n setup" header.
2c99e58
zenati [ci skip] Added examples for color_field_tag method 235e0d9
Arthur Nogueira Neves Merge pull request #14771 from heironimus/i18n_guide_reorder
Reorder i18n guide
8fab384
Rafael Mendonça França Merge pull request #14779 from zenati/master
[ci skip] Added examples for color_field_tag method
11eb1e3
zenati [ci skip] Added examples for search_field_tag method 4d566ee
Rafael Mendonça França Merge pull request #14780 from zenati/master
[ci skip] Added examples for search_field_tag method
4134d42
zenati [ci skip] Added examples for telephone_field_tag method 1292051
zenati [ci skip] Added examples for url_field_tag method c0c646f
Rafael Mendonça França Merge pull request #14781 from zenati/master
[ci skip] Added examples for telephone_field_tag and url_field_tag methods
db5a610
Hakan Ensari Autoload ActiveModel::StrictValidationFailed
Currently, if environment doesn’t eager load code, invoking this
constant before calling #valid? on a model instance results in a
NameError.
9be22bd
Rafael Mendonça França Merge pull request #14783 from hakanensari/autoload-strict-validation…
…-failed

Autoload ActiveModel::StrictValidationFailed
542457b
Apr 17, 2014
PaulL1 CSRF protection should rescue exception not extend
I think the changes to the default behaviour mean that rails will throw an exception when an invalid authenticity token is found.  The previous proposed code of calling super then sign_out meant that sign_out was never reached - the exception handler never returned.

I think the best approach now is to catch the exception, although I'm not 100% certain on that.
92fd44b
Arthur Nogueira Neves Bring SQLite3Adpter init API closer to others 4db2e1f
Rafael Mendonça França Merge pull request #14788 from arthurnn/conn_adpt_api
Bring SQLite3Adpter init API closer to others
27a0a4b
Rafael Mendonça França Merge pull request #14755 from timlinquist/to_io_http_upload
Use common to_io so users can access the underlying IO object
b77d10f
Rafael Mendonça França Implement to_io as an alias 6a13ed7
Rafael Mendonça França Change the method description d1c5e4b
Rafael Mendonça França Add CHANGELOG entry for #14755 [ci skip] c91a531
Rafael Mendonça França Merge pull request #14738 from tilsammans/pull/11407
Remove wrapping div with inline styles for hidden form fields.

Conflicts:
	actionview/CHANGELOG.md
cbb9174
Rafael Mendonça França Update Request forgery tests to remove input wrappign div
This was changed at cbb9174
dd5f831
Rafael Mendonça França Remove wrapper div for inputs in button_to
Related with cbb9174
1de258e
PaulL1 Include default rails protect_from_forgery with: :exception
Extend previous changes, include the default line from the application controller that new rails applications are created with: 
  protect_from_forgery with: :exception

Minor wording changes to align.
d315275
Rafael Mendonça França Merge pull request #14786 from PaulL1/patch-1
CSRF protection should rescue exception not extend
a3fd6e7