aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \
| * | | | | | | Remove the word "mongrel" from documentsRyunosuke Sato2016-09-077-9/+9
|/ / / / / / /
* | | | | | | Merge pull request #26405 from alexcameron89/case_statement_formattingXavier Noria2016-09-0610-113/+123
|\ \ \ \ \ \ \
| * | | | | | | Fix Remaining Case-In-Assignment Statement FormattingAlex Kitchens2016-09-0610-113/+123
* | | | | | | | Merge pull request #26406 from SpartaSixZero/masterVipul A M2016-09-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Minor grammar fix in engines.mdMark Sun2016-09-061-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #26394 from kamipo/remove_redundant_conditionAndrew White2016-09-061-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove redundant `!loaded?` conditionRyuta Kamizono2016-09-061-2/+2
* | | | | | | | Merge pull request #26397 from yui-knk/unused_inner_aliasMatthew Draper2016-09-061-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove not used alias methodyui-knk2016-09-061-1/+0
|/ / / / / / /
* | | | | | | Merge pull request #26370 from yahonda/rails26368Andrew White2016-09-052-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Change require order to come `require "models/post"` before `require "models/...Yasuo Honda2016-09-022-2/+2
* | | | | | | | Merge pull request #26391 from y-yagi/use_descendants_to_get_all_subclassesAndrew White2016-09-054-1/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | use `descendants` to get class that inherited `ActiveJob::Base`yuuji.yaginuma2016-09-054-1/+17
| |/ / / / / / /
* | | | | | | | Merge pull request #26379 from kamipo/remove_unnecessary_query_scopeAndrew White2016-09-051-4/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Remove unnecessary `query_scope`Ryuta Kamizono2016-08-161-4/+0
* | | | | | | | Merge pull request #26392 from y-yagi/chage_descendants_to_public_apiVipul A M2016-09-051-2/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | change `Class#descendants` to public API [ci skip]yuuji.yaginuma2016-09-051-2/+15
|/ / / / / / / /
* | | | | | | | Merge pull request #26377 from y-yagi/rename_test_method_to_avoid_overridingEileen M. Uchitelle2016-09-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | rename test method to avoid overridingyuuji.yaginuma2016-09-031-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #26383 from kamipo/remove_unnecessary_count_for_collection...Eileen M. Uchitelle2016-09-042-36/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unnecessary `count` method for collection proxyRyuta Kamizono2016-09-042-36/+14
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #26384 from y-yagi/make_fixture_file_upload_in_integration...Eileen M. Uchitelle2016-09-043-1/+43
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | make `fixture_file_upload` work in integration testsyuuji.yaginuma2016-09-043-1/+43
| |/ / / / / /
* | | | | | | Merge pull request #26382 from naw/transaction-callback-docsVipul A M2016-09-042-1/+9
|\ \ \ \ \ \ \
| * | | | | | | Update docs for change in transaction callback exceptionsNathan Wenneker2016-09-032-1/+9
|/ / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 15:51:22 +0000