| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #24869 from vipulnsward/change-example | Rafael França | 2016-05-05 | 1 | -3/+3 |
|\ |
|
| * | Change to use a more realistic example and not giving the impression that des... | Vipul A M | 2016-05-05 | 1 | -3/+3 |
* | | Merge pull request #24868 from vipulnsward/delegate_encode_with | Rafael França | 2016-05-05 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | delegate encode_with instead of to_yaml, which is deprecated | Vipul A M | 2016-05-05 | 1 | -1/+1 |
* | | Merge pull request #24860 from maclover7/jm-rm-space | Rafael França | 2016-05-05 | 1 | -2/+2 |
|\ \ |
|
| * | | Remove extra space [ci skip] | Jon Moss | 2016-05-05 | 1 | -2/+2 |
* | | | [ci skip] Don't promote SQL interpolation. | Kasper Timm Hansen | 2016-05-05 | 1 | -2/+2 |
* | | | Merge pull request #24859 from y-yagi/do_not_pass_conditon_to_destroy_all | Vipul A M | 2016-05-05 | 2 | -3/+3 |
|\ \ \ |
|
| * | | | do not pass conditions to `#destroy_all` [ci skip] | yuuji.yaginuma | 2016-05-05 | 2 | -3/+3 |
| | |/
| |/| |
|
* | | | Merge pull request #24780 from rails/run-as-test-in-both-to-time-modes | Andrew White | 2016-05-05 | 4 | -6/+24 |
|\ \ \
| |_|/
|/| | |
|
| * | | Run Active Support tests when preserving timezones | Andrew White | 2016-05-05 | 2 | -0/+4 |
| * | | Fix tests when preserving timezones | Andrew White | 2016-05-05 | 2 | -6/+19 |
| * | | Fix to_yaml test when run individually | Andrew White | 2016-05-05 | 1 | -0/+1 |
|/ / |
|
* | | Merge pull request #24820 from maclover7/fix-15843 | Kasper Timm Hansen | 2016-05-04 | 2 | -1/+31 |
|\ \ |
|
| * | | Ensure compatibility between ActionDispatch::Request::Session and Rack | Jon Moss | 2016-05-04 | 2 | -1/+31 |
* | | | Merge pull request #24851 from maclover7/jm-bump-ruby-versions | Kasper Timm Hansen | 2016-05-04 | 1 | -3/+3 |
|\ \ \ |
|
| * | | | Bump Ruby versions | Jon Moss | 2016-05-04 | 1 | -3/+3 |
| |/ / |
|
* | | | Merge pull request #24852 from jrafanie/fix_typos | Vipul A M | 2016-05-04 | 8 | -8/+8 |
|\ \ \
| |_|/
|/| | |
|
| * | | Fix some typos in comments. | Joe Rafaniello | 2016-05-04 | 8 | -8/+8 |
|/ / |
|
* | | renames ActionCable::Railtie to ActionCable::Engine | Xavier Noria | 2016-05-04 | 1 | -1/+1 |
* | | Merge pull request #24845 from tomkadwill/action_controller_typos | Rafael França | 2016-05-04 | 2 | -3/+3 |
|\ \
| |/
|/| |
|
| * | Fix actionpack typos [ci skip] | Tom Kadwill | 2016-05-04 | 2 | -3/+3 |
* | | Merge pull request #24839 from vipulnsward/fix-bundler-ci | Rafael França | 2016-05-03 | 4 | -7/+9 |
|\ \ |
|
| * | | Followup of #24835 | Vipul A M | 2016-05-03 | 4 | -6/+6 |
| * | | Depend on bundler 1.11.2 on travis until bundle update discrepancy is solved ... | Vipul A M | 2016-05-03 | 1 | -2/+4 |
* | | | Check for the right exception | Rafael Mendonça França | 2016-05-03 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #24835 from christianblais/activemodel/rangeerror | Rafael França | 2016-05-03 | 4 | -7/+12 |
|\ \ |
|
| * | | Change RangeError to a more specific ActiveModel::RangeError | Christian Blais | 2016-05-03 | 4 | -7/+12 |
|/ / |
|
* | | Merge pull request #24832 from prathamesh-sonpatki/fix-release-notes | Kasper Timm Hansen | 2016-05-03 | 1 | -10/+3 |
|\ \ |
|
| * | | Release notes: Remove duplicate entries [ci skip] | Prathamesh Sonpatki | 2016-05-03 | 1 | -10/+3 |
* | | | Merge pull request #24833 from Erol/fix-typo | प्रथमेश Sonpatki | 2016-05-03 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Fix small typo in Active Record Migrations documentation [ci skip] | Erol Fornoles | 2016-05-03 | 1 | -1/+1 |
* | | | | Merge pull request #24831 from y-yagi/remove_empty_from_changelog | Eileen M. Uchitelle | 2016-05-03 | 1 | -2/+1 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | remove `empty?` from CHANGELOG [ci skip] | yuuji.yaginuma | 2016-05-03 | 1 | -2/+1 |
|/ / / |
|
* | | | Fix template resolver cache concurrency: "can't add a new key into hash durin... | Jeremy Daer | 2016-05-02 | 2 | -3/+3 |
* | | | Do not delegate `AR::Base#empty?` to `all` | Sean Griffin | 2016-05-02 | 2 | -7/+1 |
|/ / |
|
* | | Merge pull request #24810 from willnet/fix-actioncable-readme | प्रथमेश Sonpatki | 2016-05-02 | 1 | -1/+1 |
|\ \ |
|
| * | | [ci skip] Fix ActionCable README | willnet | 2016-05-02 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #24807 from kamipo/add_nodoc_to_schema_creation | Vipul A M | 2016-05-02 | 1 | -1/+1 |
|\ \ |
|
| * | | Add `:nodoc:` to `schema_creation` [ci skip] | Ryuta Kamizono | 2016-05-02 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #24713 from tomkadwill/fix_counter_cache_increment | Sean Griffin | 2016-04-30 | 3 | -0/+14 |
|\ \ |
|
| * | | Fix counter_cache double increment bug | Tom Kadwill | 2016-04-28 | 3 | -0/+14 |
* | | | Replace ActionDispatch::LoadInterlock with ActionDispatch::Executor in guides... | willnet | 2016-04-30 | 4 | -5/+5 |
* | | | Fix initial value effects for sum along to ruby 2.4 | Kenta Murata | 2016-04-30 | 2 | -5/+85 |
* | | | Merge pull request #24801 from y-yagi/fix_incorrect_module_name | Jon Moss | 2016-04-30 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | fix incorrect module name [ci skip] | yuuji.yaginuma | 2016-05-01 | 1 | -1/+1 |
|/ / / |
|
* | | | Merge pull request #24798 from mrkjlchvz/mc-grammar | Vipul A M | 2016-05-01 | 0 | -0/+0 |
|\ \ \ |
|
| * | | | Fix grammar. | Mark | 2016-05-01 | 1 | -1/+1 |
* | | | | Merge pull request #24791 from maclover7/jm-rm-ar-rails-mention | Rafael França | 2016-04-30 | 2 | -1/+5 |
|\ \ \ \ |
|
| * | | | | Replace `Rails.version.to_f` with Active Record | Jon Moss | 2016-04-30 | 2 | -1/+5 |