| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|\ \ \
| | | |
| | | | |
Support include_root_in_json for ActiveResource properly.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This commit is a backport from
https://github.com/rails/activeresource/pull/29. The
ActiveResource's include_root_in_json option is broken for 3.2.x.
|
|\ \ \ \
| | | | |
| | | | | |
Backport a super-simplified version of #6792, fixing that #exists? can produce invalid SQL: "SELECT DISTINCT DISTINCT"
|
|/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
that #exists? and others can produce invalid SQL: "SELECT DISTINCT DISTINCT"
The combination of a :uniq => true association and the #distinct call
in #construct_limited_ids_condition combine to create invalid SQL, because
we're explicitly selecting DISTINCT, and also sending #distinct on to AREL,
via the relation#distinct_value.
Where #6792 was the forever fix, this is the minimal fix. Instead of
properly indicating the distinctness of the query through #uniq_value alone,
we use a literal select statement and set #uniq_value to always be falsey
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
[ci skip]
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | | |
backport runner fixes to 3-2-stable
Conflicts:
railties/CHANGELOG.md
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Add a runner hook to Rails::Application and Rails::Engine that requires
ActiveRecord::Base to avoid circular constant loading when using observers.
This commit backports cc7dd66, c0ba0f0 and 8d01c61.
|
|\ \ \ \
| | | | |
| | | | | |
Preserve context for joins while merging relations
|
|/ / / /
| | | |
| | | |
| | | |
| | | |
| | | | |
This is a backport of #10164, already merged into
master. The issue is described in lengthy detail
in issues #3002 and #5494.
|
|\ \ \ \
| | | | |
| | | | | |
Don't try to EXPLAIN select_db calls
|
| | | | |
| | | | |
| | | | |
| | | | | |
Now with a non-broken test.
|
|/ / / / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Reason: This was backported, but the test does not pass as is.
This reverts commit a33d320cf4b57fabd9c299b09c217ee3955ecc77.
|
| | | |
| | | |
| | | |
| | | | |
In those version to_date call Fixnum#/, what will cause a failure
|
| | | |
| | | |
| | | |
| | | | |
The default enconding changed on Ruby 2.0
|
|\ \ \ \
| | | | |
| | | | | |
Using map. No need to run query again
|
|/ / / / |
|
|\ \ \ \
| | | | |
| | | | | |
Don't try to EXPLAIN select_db calls
|
| | |/ /
| |/| | |
|
|\ \ \ \
| | | | |
| | | | | |
Pluck fixed 3 2 stable
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
See #9777 for details.
Previously pluck is not returning what we wanted to
Added a test also to make sure it's working fine.
This will also fix the build for 1.8.7 as we
were doing some sort on hash.
Thanks @pixeltrix for helping me out.
Thanks @linduxed for pairing with me.
|
|/ / / / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 724020278480855bddfe749c91f1074d4f50f3c6, reversing
changes made to e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/relation/calculations.rb
activerecord/test/cases/calculations_test.rb
Reason: This caused a regression since it changed the behavior in a
stable release.
Fixes #9777
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 815a9431ab61376a7e8e1bdff21f87bc557992f8.
Conflicts:
activesupport/test/json/encoding_test.rb
Reason: This was causing a regression where the resulting string is always
returning UTF-8. Also it changes the behavior of this method on a stable release.
Fixes #9498.
|
|\ \ \ \
| | | | |
| | | | | |
Build fix for scaffold generator
|
|/ / / /
| | | |
| | | | |
3-2 behaves different when scaffolding.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Confirm a record has not already been destroyed before decrementing counter cache
Conflicts:
activerecord/CHANGELOG.md
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/associations/builder/belongs_to.rb
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
use canonical #controller_path logic in controller test cases
Conflicts:
actionpack/lib/action_controller/test_case.rb
|
|\ \ \ \
| | | | |
| | | | | |
Correct time_ago_in_words to handle situation where Fixnum#/ returns a Rational (thanks to mathn)
|
| |/ / / |
|
| | | |
| | | |
| | | |
| | | | |
Fix tests related to scaffolding generator with --assets=false switch
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fixes Scaffold generator with --assets=false
Conflicts:
railties/CHANGELOG.md
Conflicts:
railties/CHANGELOG.md
railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| | | |
| | | | |
Using secure source https://rubygems.org when generating new plugin with Rails 3.2
|
| | | | |
|
|/ / /
| | |
| | |
| | | |
Closes #10241 [ci skip]
|
|\ \ \
| | | |
| | | | |
3-2-stable documentation: the possibility to use a hash of hashes for nested attributes
|
|/ / /
| | |
| | |
| | |
| | |
| | | |
Document the possibility to use a hash of hashes for nested attributes for a one-to-many association (in addition to the documented possibility to use an array of hashes).
Align indentation in comments.
|
|\ \ \
| | | |
| | | | |
Backport: Correctly parse bigint defaults in PostgreSQL
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
activerecord/test/cases/schema_dumper_test.rb
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
* 3-2-later:
adding test for CVE
|
| | | | |
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | | |
Fix explicit names on multiple file fields
|
|/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If a file field tag is passed the multiple option, it is turned into an
array field (appending "[]"), but if the file field is passed an
explicit name as an option, leave the name alone (do not append "[]").
Fixes #9830
|
| | | |
| | | |
| | | |
| | | | |
Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
|
| | | |
| | | |
| | | |
| | | | |
Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
|