aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #24589 from vipulnsward/am-fragment-cacheRafael França2016-05-055-3/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | Expand on Action Mailer Fragment caching tests
| * | | | | | Expand on Action Mailer Fragment caching testsVipul A M2016-04-176-4/+63
| | | | | | |
* | | | | | | Merge pull request #24806 from vipulnsward/errors-details-testRafael França2016-05-051-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Followup of #18322
| * | | | | | | Followup of #18322Vipul A M2016-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mirror the documented new behavior of including details, when performing errors test.
* | | | | | | | Merge pull request #24869 from vipulnsward/change-exampleRafael França2016-05-051-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Change to use a more realistic example [ci skip]
| * | | | | | | | Change to use a more realistic example and not giving the impression that ↵Vipul A M2016-05-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | destroy_all is preferred way to destroy related records. This example just wants to demonstrate callback behaviour. [ci skip]
* | | | | | | | | Merge pull request #24868 from vipulnsward/delegate_encode_withRafael França2016-05-051-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | delegate encode_with instead of to_yaml, which is deprecated
| * | | | | | | | delegate encode_with instead of to_yaml, which is deprecatedVipul A M2016-05-051-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #24860 from maclover7/jm-rm-spaceRafael França2016-05-051-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Remove extra space [ci skip]
| * | | | | | | | Remove extra space [ci skip]Jon Moss2016-05-051-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | [ci skip] Don't promote SQL interpolation.Kasper Timm Hansen2016-05-051-2/+2
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After fb898e9, the `before_destroy` had some code that used SQL interpolation left over. Don't think we should promote that even if the values aren't directly from user input.
* | | | | | | Merge pull request #24859 from y-yagi/do_not_pass_conditon_to_destroy_allVipul A M2016-05-052-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | do not pass conditions to `#destroy_all` [ci skip]
| * | | | | | | do not pass conditions to `#destroy_all` [ci skip]yuuji.yaginuma2016-05-052-3/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Passing conditions to `#destroy_all` was deprecated in c82c5f8.
* | | | | | | Merge pull request #24780 from rails/run-as-test-in-both-to-time-modesAndrew White2016-05-054-6/+24
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Run Active Support tests in both `to_time` modes
| * | | | | | Run Active Support tests when preserving timezonesAndrew White2016-05-052-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to the matrix of Travis tests an entry that runs the Active Support tests when `ActiveSupport.to_time_preserves_timezone = true`.
| * | | | | | Fix tests when preserving timezonesAndrew White2016-05-052-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two tests are explicitly testing that to_time is returning times with the sytem timezone's UTC offset, therefore they will fail when running them with `ActiveSupport.to_time_preserves_timezone = true`.
| * | | | | | Fix to_yaml test when run individuallyAndrew White2016-05-051-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The to_yaml method is undefined when running the test as: $ ruby -I lib:test test/core_ext/string_ext_test.rb Doesn't fail when running rake test:isolated presumably because something else has required 'yaml' already.
* | | | | | Merge pull request #24820 from maclover7/fix-15843Kasper Timm Hansen2016-05-042-1/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ensure compatibility between ActionDispatch::Request::Session and Rack
| * | | | | | Ensure compatibility between ActionDispatch::Request::Session and RackJon Moss2016-05-042-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the `each` method is required for ensuring compatibility between Rails, and other Rack frameworks (like Sinatra, etc.), that are mounted within Rails, and wish to use its session tooling. Prior to this, there was an inconsistency between ActionDispatch::Request::Session and Rack::Session::Cookie, due to the absence of the `each` method. This should hopefully fix that error. :) For a full integration test with Sinatra and a standalone Rack application, you can check out the gist for that here: https://gist.github.com/maclover7/08cd95b0bfe259465314311941326470. Solves #15843.
* | | | | | | Merge pull request #24851 from maclover7/jm-bump-ruby-versionsKasper Timm Hansen2016-05-041-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Bump Ruby versions
| * | | | | | | Bump Ruby versionsJon Moss2016-05-041-3/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.2.4 --> 2.2.5 2.3.0 --> 2.3.1
* | | | | | | Merge pull request #24852 from jrafanie/fix_typosVipul A M2016-05-048-8/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fix some typos in comments [ci skip]
| * | | | | | Fix some typos in comments.Joe Rafaniello2016-05-048-8/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | renames ActionCable::Railtie to ActionCable::EngineXavier Noria2016-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an engine living in action_cable/engine.rb, convention is to call these things *::Engine. Looking at thi git history looks like the current *::Railtie was just an accident.
* | | | | | Merge pull request #24845 from tomkadwill/action_controller_typosRafael França2016-05-042-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix actionpack typos [ci skip]
| * | | | | Fix actionpack typos [ci skip]Tom Kadwill2016-05-042-3/+3
| | | | | |
* | | | | | Merge pull request #24839 from vipulnsward/fix-bundler-ciRafael França2016-05-034-7/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Depend on bundler 1.11.2 on travis until bundle update discrepancy is solved on 1.12.x
| * | | | | | Followup of #24835Vipul A M2016-05-034-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failing tests
| * | | | | | Depend on bundler 1.11.2 on travis until bundle update discrepancy is solved ↵Vipul A M2016-05-031-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | on 1.12.x
* | | | | | | Check for the right exceptionRafael Mendonça França2016-05-031-1/+1
|/ / / / / /
* | | | | | Merge pull request #24835 from christianblais/activemodel/rangeerrorRafael França2016-05-034-7/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Change RangeError to a more specific ActiveModel::RangeError
| * | | | | | Change RangeError to a more specific ActiveModel::RangeErrorChristian Blais2016-05-034-7/+12
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The should make it easier for apps to rescue ActiveModel specific errors without the need to wrap all method calls with a generic rescue RangeError.
* | | | | | Merge pull request #24832 from prathamesh-sonpatki/fix-release-notesKasper Timm Hansen2016-05-031-10/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Release notes: Remove duplicate entries
| * | | | | | Release notes: Remove duplicate entries [ci skip]Prathamesh Sonpatki2016-05-031-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed duplicate entry for collection caching. - The entry was duplicate and the link to PR was also wrong. - Consolidated entries for `belongs_to` required by default.
* | | | | | | Merge pull request #24833 from Erol/fix-typoप्रथमेश Sonpatki2016-05-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix small typo in Active Record Migrations documentation
| * | | | | | | Fix small typo in Active Record Migrations documentation [ci skip]Erol Fornoles2016-05-031-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #24831 from y-yagi/remove_empty_from_changelogEileen M. Uchitelle2016-05-031-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | remove `empty?` from CHANGELOG [ci skip]
| * | | | | | | remove `empty?` from CHANGELOG [ci skip]yuuji.yaginuma2016-05-031-2/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Follow up to 98264a1343fad6bb6637893a37fd571916b4158c
* | | | | | | Fix template resolver cache concurrency: "can't add a new key into hash ↵Jeremy Daer2016-05-022-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during iteration" Resolved by https://github.com/ruby-concurrency/concurrent-ruby/pull/529 Fixes #24627.
* | | | | | | Do not delegate `AR::Base#empty?` to `all`Sean Griffin2016-05-022-7/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike `one?` and `none?`, `empty?` has interactions with methods outside of enumerable. It also doesn't fit in the same vein. `Topic.any?` makes sense. `Topic.empty?` does not, as `Topic` is not a container. Fixes #24808 Close #24812
* | | | | | Merge pull request #24810 from willnet/fix-actioncable-readmeप्रथमेश Sonpatki2016-05-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Fix ActionCable README
| * | | | | | [ci skip] Fix ActionCable READMEwillnet2016-05-021-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | default worker pool size was changed from 100 to 4 at #24376
* | | | | | Merge pull request #24807 from kamipo/add_nodoc_to_schema_creationVipul A M2016-05-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add `:nodoc:` to `schema_creation` [ci skip]
| * | | | | | Add `:nodoc:` to `schema_creation` [ci skip]Ryuta Kamizono2016-05-021-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `schema_creation` is not public API. https://github.com/rails/rails/blob/v5.0.0.beta4/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L121 https://github.com/rails/rails/blob/v5.0.0.beta4/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L78
* | | | | | Merge pull request #24713 from tomkadwill/fix_counter_cache_incrementSean Griffin2016-04-303-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix counter_cache double increment bug Close #24183
| * | | | | | Fix counter_cache double increment bugTom Kadwill2016-04-283-0/+14
| | | | | | |
* | | | | | | Replace ActionDispatch::LoadInterlock with ActionDispatch::Executor in ↵willnet2016-04-304-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guides [ci skip] Guides should be updated because ActionDispatch::LoadInterlock was replaced with ActionDispatch::Executor at #23807.
* | | | | | | Fix initial value effects for sum along to ruby 2.4Kenta Murata2016-04-302-5/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | | | | | Merge pull request #24801 from y-yagi/fix_incorrect_module_nameJon Moss2016-04-301-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix incorrect module name [ci skip]
| * | | | | | | fix incorrect module name [ci skip]yuuji.yaginuma2016-05-011-1/+1
|/ / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 14:46:33 +0000