aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24806 from vipulnsward/errors-details-testRafael França2016-05-051-1/+1
|\
| * Followup of #18322Vipul A M2016-05-021-1/+1
* | Merge pull request #24869 from vipulnsward/change-exampleRafael França2016-05-051-3/+3
|\ \
| * | Change to use a more realistic example and not giving the impression that des...Vipul A M2016-05-051-3/+3
* | | Merge pull request #24868 from vipulnsward/delegate_encode_withRafael França2016-05-051-1/+1
|\ \ \ | |/ / |/| |
| * | 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]Jon Moss2016-05-051-2/+2
* | | | [ci skip] Don't promote SQL interpolation.Kasper Timm Hansen2016-05-051-2/+2
* | | | 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]yuuji.yaginuma2016-05-052-3/+3
| | |/ / | |/| |
* | | | Merge pull request #24780 from rails/run-as-test-in-both-to-time-modesAndrew White2016-05-054-6/+24
|\ \ \ \ | |_|/ / |/| | |
| * | | Run Active Support tests when preserving timezonesAndrew White2016-05-052-0/+4
| * | | Fix tests when preserving timezonesAndrew White2016-05-052-6/+19
| * | | Fix to_yaml test when run individuallyAndrew White2016-05-051-0/+1
|/ / /
* | | Merge pull request #24820 from maclover7/fix-15843Kasper Timm Hansen2016-05-042-1/+31
|\ \ \
| * | | Ensure compatibility between ActionDispatch::Request::Session and RackJon Moss2016-05-042-1/+31
* | | | Merge pull request #24851 from maclover7/jm-bump-ruby-versionsKasper Timm Hansen2016-05-041-3/+3
|\ \ \ \
| * | | | Bump Ruby versionsJon Moss2016-05-041-3/+3
| |/ / /
* | | | Merge pull request #24852 from jrafanie/fix_typosVipul A M2016-05-048-8/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix some typos in comments.Joe Rafaniello2016-05-048-8/+8
|/ / /
* | | renames ActionCable::Railtie to ActionCable::EngineXavier Noria2016-05-041-1/+1
* | | Merge pull request #24845 from tomkadwill/action_controller_typosRafael França2016-05-042-3/+3
|\ \ \ | |/ / |/| |
| * | 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
|\ \ \
| * | | Followup of #24835Vipul A M2016-05-034-6/+6
| * | | Depend on bundler 1.11.2 on travis until bundle update discrepancy is solved ...Vipul A M2016-05-031-2/+4
* | | | 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::RangeErrorChristian Blais2016-05-034-7/+12
|/ / /
* | | Merge pull request #24832 from prathamesh-sonpatki/fix-release-notesKasper Timm Hansen2016-05-031-10/+3
|\ \ \
| * | | Release notes: Remove duplicate entries [ci skip]Prathamesh Sonpatki2016-05-031-10/+3
* | | | Merge pull request #24833 from Erol/fix-typoप्रथमेश Sonpatki2016-05-031-1/+1
|\ \ \ \
| * | | | 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]yuuji.yaginuma2016-05-031-2/+1
|/ / / /
* | | | Fix template resolver cache concurrency: "can't add a new key into hash durin...Jeremy Daer2016-05-022-3/+3
* | | | Do not delegate `AR::Base#empty?` to `all`Sean Griffin2016-05-022-7/+1
|/ / /
* | | Merge pull request #24810 from willnet/fix-actioncable-readmeप्रथमेश Sonpatki2016-05-021-1/+1
|\ \ \
| * | | [ci skip] Fix ActionCable READMEwillnet2016-05-021-1/+1
|/ / /
* | | Merge pull request #24807 from kamipo/add_nodoc_to_schema_creationVipul A M2016-05-021-1/+1
|\ \ \
| * | | Add `:nodoc:` to `schema_creation` [ci skip]Ryuta Kamizono2016-05-021-1/+1
|/ / /
* | | Merge pull request #24713 from tomkadwill/fix_counter_cache_incrementSean Griffin2016-04-303-0/+14
|\ \ \
| * | | Fix counter_cache double increment bugTom Kadwill2016-04-283-0/+14
* | | | Replace ActionDispatch::LoadInterlock with ActionDispatch::Executor in guides...willnet2016-04-304-5/+5
* | | | Fix initial value effects for sum along to ruby 2.4Kenta Murata2016-04-302-5/+85
* | | | Merge pull request #24801 from y-yagi/fix_incorrect_module_nameJon Moss2016-04-301-1/+1
|\ \ \ \
| * | | | fix incorrect module name [ci skip]yuuji.yaginuma2016-05-011-1/+1
|/ / / /
* | | | Merge pull request #24798 from mrkjlchvz/mc-grammarVipul A M2016-05-010-0/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix grammar.Mark2016-05-011-1/+1