Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #26489 from kamipo/fix_broken_comments_indentation | Xavier Noria | 2016-09-14 | 67 | -1665/+1670 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix broken comments indentation caused by rubocop auto-correct [ci skip] | Ryuta Kamizono | 2016-09-14 | 67 | -1665/+1670 | |
|/ / / / / / | ||||||
* | | | | | | Do not point to the 5-0-stable branch | Rafael Mendonça França | 2016-09-13 | 1 | -1/+1 | |
* | | | | | | Merge pull request #26484 from yahonda/mysql2_ambiguous_first_arguments | Rafael França | 2016-09-13 | 1 | -2/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Address `warning: ambiguous first argument; put parentheses or a space even a... | Yasuo Honda | 2016-09-13 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | 5-0-backport: activerecord/mysql2: Avoid setting @connection to nil, just clo... | Dylan Thacker-Smith | 2016-09-13 | 1 | -0/+5 | |
* | | | | | | Merge pull request #26314 from frodsan/puma-ar-disconnect | Richard Schneeman | 2016-09-13 | 1 | -0/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Disconnects all connections in the pool before forking. | Francesco Rodriguez | 2016-08-29 | 1 | -0/+8 | |
* | | | | | | | Merge pull request #26466 from y-yagi/remove_duplicated_fixture_set_names | Arthur Nogueira Neves | 2016-09-13 | 3 | -3/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | remove duplicated fixture set names | yuuji.yaginuma | 2016-09-12 | 3 | -3/+5 | |
* | | | | | | | | Merge pull request #26478 from girishso/fix-guides-for-partial-render-as-option | Eileen M. Uchitelle | 2016-09-13 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | fixed guide to add correct documentation for partial render 'as' option | Girish S | 2016-09-13 | 1 | -7/+7 | |
|/ / / / / / / | ||||||
* | | | | | | | [ci skip] Update Levenshtein code with better attribution. | Kasper Timm Hansen | 2016-09-12 | 2 | -2/+6 | |
* | | | | | | | Merge pull request #26460 from kamipo/remove_useless_test_string_with_crazy_c... | Sean Griffin | 2016-09-12 | 1 | -6/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove useless `test_string_with_crazy_column` | Ryuta Kamizono | 2016-09-11 | 1 | -6/+2 | |
* | | | | | | | | Merge pull request #26434 from dylanahsmith/mysql2-no-nil-connection | Arthur Nogueira Neves | 2016-09-12 | 3 | -15/+28 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | activerecord/mysql2: Avoid setting @connection to nil, just close it | Dylan Thacker-Smith | 2016-09-08 | 3 | -15/+28 | |
* | | | | | | | | | Merge pull request #26459 from ysksn/add_test_for_activerecord_enum | Eileen M. Uchitelle | 2016-09-12 | 4 | -0/+43 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add tests for ActiveRecord::Enum#enum when suffix specified | Yosuke Kabuto | 2016-09-12 | 4 | -0/+43 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #26458 from kamipo/remove_unused_require_thread | Santiago Pastorino | 2016-09-11 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove unused `require "thread"` in `test/cases/attribute_methods/read_test.rb` | Ryuta Kamizono | 2016-09-11 | 1 | -1/+0 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #26462 from kamipo/remove_duplicated_elsif_branch | Arthur Nogueira Neves | 2016-09-11 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Remove duplicated `elsif` branch | Ryuta Kamizono | 2016-09-11 | 1 | -2/+0 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #26449 from prathamesh-sonpatki/fixes | Guillermo Iguaran | 2016-09-10 | 2 | -16/+16 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Use :git for specifying dependencies from github with https protocol | Prathamesh Sonpatki | 2016-09-10 | 2 | -16/+16 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #26450 from y-yagi/fix_broken_test | Arthur Nogueira Neves | 2016-09-10 | 1 | -0/+18 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | use correct Gemfile in `bin/setup` test | yuuji.yaginuma | 2016-09-11 | 1 | -0/+18 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #26442 from kirs/action-controller-session-options-mutate1 | Arthur Nogueira Neves | 2016-09-10 | 2 | -1/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Do not mutate AC::TestRequest::DEFAULT_OPTIONS | Kir Shatrov | 2016-09-10 | 2 | -1/+6 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #26454 from kamipo/remove_outdated_todo_comment | Richard Schneeman | 2016-09-10 | 1 | -1/+0 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Remove outdated "#TODO: Fix for binds." comment [ci skip] | Ryuta Kamizono | 2016-09-11 | 1 | -1/+0 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #26380 from kamipo/pass_set_inverse_instance_block | Kasper Timm Hansen | 2016-09-08 | 1 | -2/+2 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Pass `set_inverse_instance` block to `sc.execute` for `SingularAssociation` | Ryuta Kamizono | 2016-09-03 | 1 | -2/+2 | |
* | | | | | Merge pull request #26431 from wytesk133/master | प्रथमेश Sonpatki | 2016-09-08 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix table name typos [ci skip] | Waitaya Krongapiradee | 2016-09-08 | 1 | -1/+1 | |
* | | | | | | Merge pull request #26426 from y-yagi/update_doc_about_default_cache_store | Jon Moss | 2016-09-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | update doc about default `cache_store` [ci skip] | yuuji.yaginuma | 2016-09-08 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #26418 from y-yagi/fixes_26415 | Richard Schneeman | 2016-09-07 | 2 | -1/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | call `.to_h` to avoid using deprecated method | yuuji.yaginuma | 2016-09-07 | 2 | -1/+8 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #26016 from nateberkopec/patch-1 | Vipul A M | 2016-09-07 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Clarify expires_now documentation | Nate Berkopec | 2016-09-06 | 1 | -2/+3 | |
* | | | | | | | Merge pull request #26390 from Neodelf/format_mds | Vipul A M | 2016-09-07 | 4 | -8/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ci skip] Simply formatting documents | Neodelf | 2016-09-06 | 4 | -8/+8 | |
* | | | | | | | | Merge pull request #26412 from rails/revert-26410-rm-dups | Guillermo Iguaran | 2016-09-06 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Revert " [ci skip] Remove duplicate example." | Vipul A M | 2016-09-06 | 1 | -0/+5 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #26410 from aditya-kapoor/rm-dups | Vipul A M | 2016-09-06 | 1 | -5/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | [ci skip] Remove duplicate example. | Aditya Kapoor | 2016-09-06 | 1 | -5/+0 | |
* | | | | | | | | | Merge pull request #24612 from vipulnsward/fix-li-ol-width | Vijay Dev | 2016-09-06 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | ||||||
| * | | | | | | | | Selectively add `li ul, li ol { margin:0 1.5em; }` to subColl needed for Chap... | Vipul A M | 2016-04-19 | 1 | -1/+2 | |
* | | | | | | | | | Merge pull request #26408 from tricknotes/bye-mongrel-from-docs | Vipul A M | 2016-09-06 | 7 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ |