aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #10646 from kennyj/fix_am_20130517Rafael Mendonça França2013-05-201-1/+1
|/ / / | | | | | | | | | | | | | | | | | | Fix ActionMailer testcase break with mail 2.5.4. Conflicts: actionmailer/CHANGELOG.md actionmailer/test/mailers/base_mailer.rb
* | | Merge pull request #10578 from dingle/lu/back_port_to_json_fixRafael Mendonça França2013-05-153-3/+19
|\ \ \ | | | | | | | | Support include_root_in_json for ActiveResource properly.
| * | | Support include_root_in_json for ActiveResource properly.Xinjiang Lu2013-05-153-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #10616 from Empact/backport-distinct-distinctRafael Mendonça França2013-05-143-0/+20
|\ \ \ \ | | | | | | | | | | Backport a super-simplified version of #6792, fixing that #exists? can produce invalid SQL: "SELECT DISTINCT DISTINCT"
| * | | | Backport a super-simplified version of #6792, fixingBen Woosley2013-05-143-0/+20
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Update mail to minimum version 2.5.4Mikel Lindsaar2013-05-141-1/+1
| | | |
* | | | Improve CHANGELOG entriesRafael Mendonça França2013-05-122-3/+13
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0Rafael Mendonça França2013-05-1210-1/+87
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | backport runner fixes to 3-2-stable Conflicts: railties/CHANGELOG.md
| * | | backport runner fixes to 3-2-stablekennyj2012-12-1610-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #10303 from ahorner/3-2-stableRafael Mendonça França2013-05-115-4/+47
|\ \ \ \ | | | | | | | | | | Preserve context for joins while merging relations
| * | | | Preserve context for joins while merging relationsAndrew Horner2013-05-115-4/+47
|/ / / / | | | | | | | | | | | | | | | | | | | | This is a backport of #10164, already merged into master. The issue is described in lengthy detail in issues #3002 and #5494.
* | | | Merge pull request #10571 from dasch/dasch/restore-explain-fixRafael Mendonça França2013-05-113-1/+12
|\ \ \ \ | | | | | | | | | | Don't try to EXPLAIN select_db calls
| * | | | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-123-1/+12
| | | | | | | | | | | | | | | | | | | | Now with a non-broken test.
* | | | | Add CHANGELOG entry removed by mistake [ci skip]Rafael Mendonça França2013-05-111-0/+7
|/ / / /
* | | | Revert "Don't try to EXPLAIN select_db calls"Xavier Noria2013-05-112-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reason: This was backported, but the test does not pass as is. This reverts commit a33d320cf4b57fabd9c299b09c217ee3955ecc77.
* | | | So not make Fixnum#/ private on Ruby verions less than 1.9.3Rafael Mendonça França2013-05-101-4/+3
| | | | | | | | | | | | | | | | In those version to_date call Fixnum#/, what will cause a failure
* | | | Fix test to ruby 2.0Rafael Mendonça França2013-05-101-2/+9
| | | | | | | | | | | | | | | | The default enconding changed on Ruby 2.0
* | | | Merge pull request #10557 from arunagw/pluck-refactor-using-mapAndrew White2013-05-101-1/+1
|\ \ \ \ | | | | | | | | | | Using map. No need to run query again
| * | | | Using map. No need to run query againArun Agrawal2013-05-101-1/+1
|/ / / /
* | | | Merge pull request #10555 from dasch/dasch/3-2-stableXavier Noria2013-05-102-1/+8
|\ \ \ \ | | | | | | | | | | Don't try to EXPLAIN select_db calls
| * | | | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-102-1/+8
| | |/ / | |/| |
* | | | Merge pull request #10552 from arunagw/pluck-fixed-3-2-stableRafael Mendonça França2013-05-102-6/+7
|\ \ \ \ | | | | | | | | | | Pluck fixed 3 2 stable
| * | | | Fixed pluck to be working with selects.Arun Agrawal2013-05-102-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Remove useless elseArun Agrawal2013-05-101-3/+0
|/ / / /
* | | | Revert "Merge pull request #8209 from senny/backport_8176"Rafael Mendonça França2013-05-083-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Revert "Remove unicode character encoding from ActiveSupport::JSON.encode"Rafael Mendonça França2013-05-083-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #10496 from arunagw/build-fix-scaffold-generatorCarlos Antonio da Silva2013-05-071-1/+1
|\ \ \ \ | | | | | | | | | | Build fix for scaffold generator
| * | | | Build fix for scaffold generator Arun Agrawal2013-05-071-1/+1
|/ / / / | | | | | | | | 3-2 behaves different when scaffolding.
* | | | Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroyRafael Mendonça França2013-05-063-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge pull request #10478 from cainlevy/patch-1Rafael Mendonça França2013-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | use canonical #controller_path logic in controller test cases Conflicts: actionpack/lib/action_controller/test_case.rb
* | | | Merge pull request #10406 from greenriver/distance_of_time_rationalRafael Mendonça França2013-05-062-1/+6
|\ \ \ \ | | | | | | | | | | Correct time_ago_in_words to handle situation where Fixnum#/ returns a Rational (thanks to mathn)
| * | | | Merging in fix from #8222Ben Tucker2013-05-062-1/+6
| |/ / /
* | | | Merge pull request #10466 from prathamesh-sonpatki/scaffold-assetsCarlos Antonio da Silva2013-05-051-4/+4
| | | | | | | | | | | | | | | | Fix tests related to scaffolding generator with --assets=false switch
* | | | Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-masterRafael Mendonça França2013-05-043-1/+20
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Scaffold generator with --assets=false Conflicts: railties/CHANGELOG.md Conflicts: railties/CHANGELOG.md railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
* | | adding test for the symbol refsAaron Patterson2013-04-261-0/+7
| | |
* | | just clear the caches on clear! rather than replacing. fixes #10251Aaron Patterson2013-04-171-8/+4
| | |
* | | adding a test for root path in the appAaron Patterson2013-04-171-0/+24
| | |
* | | Merge pull request #10246 from prathamesh-sonpatki/3.2.13-https-rubygemsCarlos Antonio da Silva2013-04-171-1/+1
|\ \ \ | | | | | | | | Using secure source https://rubygems.org when generating new plugin with Rails 3.2
| * | | Use secure source in generated Gemfile for creating new plugin. Closes #10245Prathamesh Sonpatki2013-04-171-1/+1
| | | |
* | | | Fix "Scaling Rails Screencasts" link in caching guideCarlos Antonio da Silva2013-04-161-1/+1
|/ / / | | | | | | | | | Closes #10241 [ci skip]
* | | Merge pull request #9688 from alexeymuranov/doc-nested-attributes-3-2Carlos Antonio da Silva2013-04-131-17/+41
|\ \ \ | | | | | | | | 3-2-stable documentation: the possibility to use a hash of hashes for nested attributes
| * | | Document nested attributes as hash of hashesAlexey Muranov2013-04-131-17/+41
|/ / / | | | | | | | | | | | | | | | 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.
* | | Merge pull request #10172 from senny/10098_backportRafael Mendonça França2013-04-114-1/+13
|\ \ \ | | | | | | | | Backport: Correctly parse bigint defaults in PostgreSQL
| * | | Correctly parse bigint defaults in PostgreSQL, Backpost #10098.Erik Peterson2013-04-114-1/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb activerecord/test/cases/schema_dumper_test.rb
* | | Merge branch '3-2-later' into 3-2-stableAaron Patterson2013-04-091-0/+10
|\ \ \ | | | | | | | | | | | | | | | | * 3-2-later: adding test for CVE
| * | | adding test for CVEAaron Patterson2013-02-091-0/+10
| | | |
* | | | Improve the changelog entry [ci skip]Rafael Mendonça França2013-04-051-3/+4
| | | |
* | | | Merge pull request #10105 from rmm5t/fix-explicit-name-on-multiple-fieldsRafael Mendonça França2013-04-053-8/+24
|\ \ \ \ | | | | | | | | | | Fix explicit names on multiple file fields
| * | | | Fix explicit names on multiple file fieldsRyan McGeary2013-04-053-8/+24
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Fix typo in view nameCarlos Antonio da Silva2013-04-032-1/+1
| | | | | | | | | | | | | | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 15:49:14 +0000