| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|\ \
| | |
| | | |
backport #8403, no intermediate AR objects when eager loading.
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| | |
Closes #3313
Conflicts:
activerecord/CHANGELOG.md
activerecord/test/models/developer.rb
|
| |
| |
| |
| |
| | |
Conflicts:
actionmailer/actionmailer.gemspec
|
| |
| |
| |
| |
| |
| |
| |
| | |
AR::Relation#pluck: improve to work with joins
Conflicts:
activerecord/lib/active_record/relation/calculations.rb
activerecord/test/cases/calculations_test.rb
|
| |
| |
| |
| |
| |
| |
| | |
See https://github.com/ruby/ruby/commit/9c1b3161f20162dc1682d758c0e4d2fc3a74745e
All Active Support tests pass in 2.0.0preview2 after this change.
Closes #8409
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
whether escaping is enabled. Fixes that existing plaintext email templates using <%== unexpectedly flipped to *escaping* HTML when #8235 was merged.
Conflicts:
actionpack/test/template/template_test.rb
|
|\ \
| | |
| | | |
Handle respond_to? with private methods
|
|/ / |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
senny/8376_descriptive_error_message_for_partial_layout_true
More descriptive error when rendering a partial with `:layout => true`
Conflicts:
actionpack/CHANGELOG.md
actionpack/lib/action_view/renderer/partial_renderer.rb
|
| | |
|
| | |
|
| |
| |
| |
| | |
Fix a problem of translate_exception method in a Japanese (non English) environment.
|
|\ \
| | |
| | | |
Fixed description for ActiveSupport::Concern typical case
|
|/ / |
|
| |
| |
| |
| | |
mistakenly getting utf8 collation
|
| |
| |
| |
| |
| |
| |
| | |
Specify type of singular assication during serialization
Conflicts:
activemodel/CHANGELOG.md
activemodel/test/cases/serializers/xml_serialization_test.rb
|
|\ \
| | |
| | | |
Fixing a schema:load when using a prefix and suffix on the tables [Reopen/backport]
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | | |
Accept symbols as #send_data :disposition value
|
| | | | |
|
| | | | |
|
|/ / / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Commits
978ec98c8eff824a60c7e973f369cc7bed1f4d36 and
51676652a3568ad09b06385564de4fdcb13af05e
changed database statements to use the schema_cache methods, added on
master in
c99e34e90d763c52cbe8dc3d950ed1b4db665dc4 and
dc973e78560a6514ab172f0ee86dc84a9147d39a
But apparently the methods weren't added to schema_cache, resulting in
the failure described in #8322 for 3-2-stable.
Fixes #8322.
Conflicts:
activerecord/lib/active_record/connection_adapters/schema_cache.rb
|
|\ \ \
| | | |
| | | | |
@steveklabnik can't spell 'distance.' [ci skip]
|
| | | | |
|
|\| | |
| | | |
| | | | |
Add i18n scope to disance_of_time_in_words.
|
|/ / /
| | |
| | |
| | | |
This is a backport of rails/rails#7997.
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Don't call will_change! for datetime nil->"".
Setting a nil datetime attribute to a blank string should not cause the
attribute to be dirty.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
|
|\ \ \
| | | |
| | | | |
backport #8291, prevent mass assignment of polymorphic type with `build`
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Closes #8265
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/associations/association.rb
|
| | |
| | |
| | |
| | |
| | |
| | | |
fix guide with field_with_error proc example
[ci skip]
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Postgresql doesn't accepts limits on text columns
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
|
| | |
| | |
| | |
| | | |
This will allow the new mysql 2.9.0 to be used, fixing our test issues.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add test to ensure preloading works as expected with "group", "select" and "includes".
Conflicts:
activerecord/test/cases/relations_test.rb
Chery-pick a739340d3c9e66814429af6f3f410c01ff86810a:
Ensure ordering to make the test pass with postgresql
Conflicts:
activerecord/test/cases/relations_test.rb
|
|\ \ \
| | | |
| | | | |
backport #8262, require bundler groups to include rake-tasks in engines
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If you generate a full engine, this will include rake tasks from
your gem under the `app` namespace. For example if you have a dependency
on `rspec-rails` in your engine's `gemspec`. You will get the task `app:spec`
Closes #8229
Conflicts:
railties/CHANGELOG.md
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
According to him, at one point his fork was the one that had the call
stack printer, and it's in the main repo now.
[ci skip]
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Backport 4bc2ae0 to fix #7950
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/relation/calculations.rb
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
See issue #7950.
The previous commit fixes this bug, and is a backport of
4bc2ae0da1dd812aee759f6d13ad428354cd0e13.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is a backport of 4bc2ae0da1dd812aee759f6d13ad428354cd0e13.
It fixes bug #7950.
Conflicts:
activerecord/lib/active_record/relation/calculations.rb
activerecord/lib/active_record/relation/finder_methods.rb
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`
Conflicts:
actionpack/CHANGELOG.md
actionpack/test/template/template_test.rb
|