aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #24885 from javiervidal/3_0_release_notesEileen M. Uchitelle2016-05-061-1/+1
|\ \ \ \ \ \
| * | | | | | Fix link in 'Ruby on Rails 3.0 Release Notes' [ci skip]Javier Vidal2016-05-061-1/+1
|/ / / / / /
* | | | | | Merge pull request #24884 from javiervidal/markdown_syntax_2_2_release_notesVipul A M2016-05-061-1/+1
|\ \ \ \ \ \
| * | | | | | Fix markdown syntax in 'Ruby on Rails 2.2 Release Notes' [ci skip]Javier Vidal2016-05-061-1/+1
|/ / / / / /
* | | | | | Merge pull request #24881 from prathamesh-sonpatki/add-24866-to-relaese-notesKasper Timm Hansen2016-05-062-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Release notes: Add PR #24866 to release notesPrathamesh Sonpatki2016-05-052-1/+5
|/ / / / /
* | | | | Merge pull request #24866 from rafaelfranca/actionview-helpersArthur Nogueira Neves2016-05-055-7/+33
|\ \ \ \ \
| * | | | | Implement helpers proxy in controller instance levelRafael Mendonça França2016-05-054-2/+29
| * | | | | Move protected instance variable to the right placeRafael Mendonça França2016-05-052-6/+5
* | | | | | Merge pull request #24799 from prathamesh-sonpatki/18439-followupRafael França2016-05-052-12/+23
|\ \ \ \ \ \
| * | | | | | Active Model: Improve CHANGELOG and documentation for `validates_acceptance_o...Prathamesh Sonpatki2016-05-052-12/+23
* | | | | | | Merge pull request #24589 from vipulnsward/am-fragment-cacheRafael França2016-05-055-3/+62
|\ \ \ \ \ \ \
| * | | | | | | 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 #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