aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #26489 from kamipo/fix_broken_comments_indentationXavier Noria2016-09-1467-1665/+1670
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix broken comments indentation caused by rubocop auto-correct [ci skip]Ryuta Kamizono2016-09-1467-1665/+1670
|/ / / / / /
* | | | | | Do not point to the 5-0-stable branchRafael Mendonça França2016-09-131-1/+1
* | | | | | Merge pull request #26484 from yahonda/mysql2_ambiguous_first_argumentsRafael França2016-09-131-2/+2
|\ \ \ \ \ \
| * | | | | | Address `warning: ambiguous first argument; put parentheses or a space even a...Yasuo Honda2016-09-131-2/+2
|/ / / / / /
* | | | | | 5-0-backport: activerecord/mysql2: Avoid setting @connection to nil, just clo...Dylan Thacker-Smith2016-09-131-0/+5
* | | | | | Merge pull request #26314 from frodsan/puma-ar-disconnectRichard Schneeman2016-09-131-0/+8
|\ \ \ \ \ \
| * | | | | | Disconnects all connections in the pool before forking.Francesco Rodriguez2016-08-291-0/+8
* | | | | | | Merge pull request #26466 from y-yagi/remove_duplicated_fixture_set_namesArthur Nogueira Neves2016-09-133-3/+5
|\ \ \ \ \ \ \
| * | | | | | | remove duplicated fixture set namesyuuji.yaginuma2016-09-123-3/+5
* | | | | | | | Merge pull request #26478 from girishso/fix-guides-for-partial-render-as-optionEileen M. Uchitelle2016-09-131-7/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | fixed guide to add correct documentation for partial render 'as' optionGirish S2016-09-131-7/+7
|/ / / / / / /
* | | | | | | [ci skip] Update Levenshtein code with better attribution.Kasper Timm Hansen2016-09-122-2/+6
* | | | | | | Merge pull request #26460 from kamipo/remove_useless_test_string_with_crazy_c...Sean Griffin2016-09-121-6/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove useless `test_string_with_crazy_column`Ryuta Kamizono2016-09-111-6/+2
* | | | | | | | Merge pull request #26434 from dylanahsmith/mysql2-no-nil-connectionArthur Nogueira Neves2016-09-123-15/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | activerecord/mysql2: Avoid setting @connection to nil, just close itDylan Thacker-Smith2016-09-083-15/+28
* | | | | | | | | Merge pull request #26459 from ysksn/add_test_for_activerecord_enumEileen M. Uchitelle2016-09-124-0/+43
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Add tests for ActiveRecord::Enum#enum when suffix specifiedYosuke Kabuto2016-09-124-0/+43
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #26458 from kamipo/remove_unused_require_threadSantiago Pastorino2016-09-111-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused `require "thread"` in `test/cases/attribute_methods/read_test.rb`Ryuta Kamizono2016-09-111-1/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #26462 from kamipo/remove_duplicated_elsif_branchArthur Nogueira Neves2016-09-111-2/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove duplicated `elsif` branchRyuta Kamizono2016-09-111-2/+0
|/ / / / / / /
* | | | | | | Merge pull request #26449 from prathamesh-sonpatki/fixesGuillermo Iguaran2016-09-102-16/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Use :git for specifying dependencies from github with https protocolPrathamesh Sonpatki2016-09-102-16/+16
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #26450 from y-yagi/fix_broken_testArthur Nogueira Neves2016-09-101-0/+18
|\ \ \ \ \ \
| * | | | | | use correct Gemfile in `bin/setup` testyuuji.yaginuma2016-09-111-0/+18
| |/ / / / /
* | | | | | Merge pull request #26442 from kirs/action-controller-session-options-mutate1Arthur Nogueira Neves2016-09-102-1/+6
|\ \ \ \ \ \
| * | | | | | Do not mutate AC::TestRequest::DEFAULT_OPTIONSKir Shatrov2016-09-102-1/+6
| |/ / / / /
* | | | | | Merge pull request #26454 from kamipo/remove_outdated_todo_commentRichard Schneeman2016-09-101-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove outdated "#TODO: Fix for binds." comment [ci skip]Ryuta Kamizono2016-09-111-1/+0
|/ / / / /
* | | | | Merge pull request #26380 from kamipo/pass_set_inverse_instance_blockKasper Timm Hansen2016-09-081-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Pass `set_inverse_instance` block to `sc.execute` for `SingularAssociation`Ryuta Kamizono2016-09-031-2/+2
* | | | | Merge pull request #26431 from wytesk133/masterप्रथमेश Sonpatki2016-09-081-1/+1
|\ \ \ \ \
| * | | | | Fix table name typos [ci skip]Waitaya Krongapiradee2016-09-081-1/+1
* | | | | | Merge pull request #26426 from y-yagi/update_doc_about_default_cache_storeJon Moss2016-09-071-1/+1
|\ \ \ \ \ \
| * | | | | | update doc about default `cache_store` [ci skip]yuuji.yaginuma2016-09-081-1/+1
* | | | | | | Merge pull request #26418 from y-yagi/fixes_26415Richard Schneeman2016-09-072-1/+8
|\ \ \ \ \ \ \
| * | | | | | | call `.to_h` to avoid using deprecated methodyuuji.yaginuma2016-09-072-1/+8
| |/ / / / / /
* | | | | | | Merge pull request #26016 from nateberkopec/patch-1Vipul A M2016-09-071-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Clarify expires_now documentationNate Berkopec2016-09-061-2/+3
* | | | | | | Merge pull request #26390 from Neodelf/format_mdsVipul A M2016-09-074-8/+8
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Simply formatting documentsNeodelf2016-09-064-8/+8
* | | | | | | | Merge pull request #26412 from rails/revert-26410-rm-dupsGuillermo Iguaran2016-09-061-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert " [ci skip] Remove duplicate example."Vipul A M2016-09-061-0/+5
|/ / / / / / / /
* | | | | | | | Merge pull request #26410 from aditya-kapoor/rm-dupsVipul A M2016-09-061-5/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] Remove duplicate example.Aditya Kapoor2016-09-061-5/+0
* | | | | | | | | Merge pull request #24612 from vipulnsward/fix-li-ol-widthVijay Dev2016-09-061-1/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Selectively add `li ul, li ol { margin:0 1.5em; }` to subColl needed for Chap...Vipul A M2016-04-191-1/+2
* | | | | | | | | Merge pull request #26408 from tricknotes/bye-mongrel-from-docsVipul A M2016-09-067-9/+9
|\ \ \ \ \ \ \ \ \