aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Fix shorthand routes where controller and action are in the scopeAndrew White2013-06-253-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge `:action` from routing scope and assign endpoint if both `:controller` and `:action` are present. The endpoint assignment only occurs if there is no `:to` present in the options hash so should only affect routes using the shorthand syntax (i.e. endpoint is inferred from the the path). Fixes #9856 Backport of 37b4276
* | | Add CHANGELOG entry for #10971Rafael Mendonça França2013-06-241-0/+14
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #10971 from dtaniwaki/escape_link_to_unlessRafael Mendonça França2013-06-242-1/+6
| | | | | | | | | | | | Always escape the result of link_to_unless method
* | | Fix textile markupRafael Mendonça França2013-06-241-1/+1
| | | | | | | | | | | | | | | Closes #11076 [ci skip]
* | | Revert "Merge pull request #10901 from ↵Yves Senn2013-06-223-34/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader" This reverts commit 6675d713186c270de1c4684bc1e56742ea2e19e1, reversing changes made to 919d1a19d5e7871d50c1531351fc3f736bad5d07. I missed to check the target branch and wrongly merged it into 3-2-stable directly.
* | | Merge pull request #10901 from ↵Yves Senn2013-06-223-1/+34
|\ \ \ | | | | | | | | | | | | | | | | armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader Fixes CollectionAssociation#ids_reader returning incorrect ids for new records
| * | | Fixes CollectionAssociation#ids_reader returning incorrect ids for new recordsJared Armstrong2013-06-213-1/+34
| | | |
* | | | Merge pull request #11033 from robin850/patch-1Xavier Noria2013-06-201-5/+5
|\ \ \ \ | | | | | | | | | | Update the feedback instructions
| * | | | Update the feedback instructions [ci skip]Robin Dupret2013-06-201-5/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | Since docrails as moved from lifo/docrails to rails/docrails we have to ask for commit rights or submit patches directly to the rails repository
* | | | Merge pull request #10883 from ifeelgoods/3-2-stableYves Senn2013-06-191-2/+2
|\ \ \ \ | | | | | | | | | | The default cache store is :file_store in caching_with_rails.textile
| * | | | indicate the default Rails cache storeMatthieu Paret2013-06-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | memory_store is the default cache store implementation if you call ActiveSupport::Cache.lookup_store without arguments.
* | | | | Compare host scheme using case-insensitive regexpRafael Mendonça França2013-06-163-11/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: image_tag("HTTP://google.com") # => "<img alt=\"Google\" src=\"/assets/HTTP://google.com\" />" image_tag("http://google.com") # => "<img alt=\"Google\" src=\"http://google.com\" />" After: image_tag("HTTP://google.com") # => "<img alt=\"Google\" src=\"HTTP://google.com\" />" image_tag("http://google.com") # => "<img alt=\"Google\" src=\"http://google.com\" />" Backport of #10969
* | | | | nokogiri >= 1.6 doesn't work with ruby 1.8Rafael Mendonça França2013-06-151-1/+1
| | | | |
* | | | | Merge pull request #10925 from senny/10917_test_to_prevent_regressionYves Senn2013-06-153-3/+35
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | regression test + mysql2 adapter raises correct error if conn is closed. Conflicts: activerecord/CHANGELOG.md
* | | | Override Time.at to work with Time-like valuesAndrew White2013-06-083-0/+38
|/ / / | | | | | | | | | | | | | | | | | | Time.at allows passing a single Time argument which is then converted to an integer. The conversion code since 1.9.3r429 explicitly checks for an instance of Time so we need to override it to allow DateTime and ActiveSupport::TimeWithZone values.
* | | adding a test for #10830Aaron Patterson2013-06-051-0/+46
| | |
* | | Restore rescue block for when IM is enabledAndrew White2013-05-241-19/+22
| | |
* | | Merge pull request #10745 from arunagw/build_fix_ruby187Andrew White2013-05-244-7/+7
|\ \ \ | | | | | | | | Build fix ruby187
| * | | It's scoped in 3-2-stable!Arun Agrawal2013-05-241-1/+1
| | | | | | | | | | | | scope => scoped
| * | | Using 1.8.7 syntax for 3-2-stableArun Agrawal2013-05-243-6/+6
|/ / /
* | | Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_manyRafael Mendonça França2013-05-234-2/+15
| | | | | | | | | | | | | | | | | | | | | Fix the `:primary_key` option for `has_many` associations. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/has_many_association.rb
* | | Merge pull request #10681 from jholton/3-2-stable-fix_association_auto_saveRafael Mendonça França2013-05-223-31/+48
|\ \ \ | | | | | | | | autosave_association issue that occurs when table has unique index (3.2.x backport)
| * | | destroys association records before saving/inserting new association recordsJohnny Holton2013-05-183-31/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a backport of #10417 fixes bug introduced by #3329 These are the conditions necessary to reproduce the bug: - For an association, autosave => true. - An association record is being destroyed - A new association record is being created. - There is a unique index one of the association's fields. - The record being created has the same value as the record being destroyed on the indexed field. Before, the deletion of records was postponed until after all insertions/saves. Therefore the new record with the identical value in the indexed field caused a non-unique value error to be thrown at the database level. With this fix, the deletions happen first, before the insertions/saves. Therefore the record with the duplicate value is gone from the database before the new record is created, thereby avoiding the non-uniuqe value error.
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 08:59:59 +0000