Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove the word "mongrel" from documents | Ryunosuke Sato | 2016-09-07 | 7 | -9/+9 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #26405 from alexcameron89/case_statement_formatting | Xavier Noria | 2016-09-06 | 10 | -113/+123 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix Remaining Case-In-Assignment Statement Formatting | Alex Kitchens | 2016-09-06 | 10 | -113/+123 | |
* | | | | | | | | | Merge pull request #26406 from SpartaSixZero/master | Vipul A M | 2016-09-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Minor grammar fix in engines.md | Mark Sun | 2016-09-06 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #26394 from kamipo/remove_redundant_condition | Andrew White | 2016-09-06 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove redundant `!loaded?` condition | Ryuta Kamizono | 2016-09-06 | 1 | -2/+2 | |
* | | | | | | | | | Merge pull request #26397 from yui-knk/unused_inner_alias | Matthew Draper | 2016-09-06 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Remove not used alias method | yui-knk | 2016-09-06 | 1 | -1/+0 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #26370 from yahonda/rails26368 | Andrew White | 2016-09-05 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Change require order to come `require "models/post"` before `require "models/... | Yasuo Honda | 2016-09-02 | 2 | -2/+2 | |
* | | | | | | | | | Merge pull request #26391 from y-yagi/use_descendants_to_get_all_subclasses | Andrew White | 2016-09-05 | 4 | -1/+17 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | use `descendants` to get class that inherited `ActiveJob::Base` | yuuji.yaginuma | 2016-09-05 | 4 | -1/+17 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #26379 from kamipo/remove_unnecessary_query_scope | Andrew White | 2016-09-05 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Remove unnecessary `query_scope` | Ryuta Kamizono | 2016-08-16 | 1 | -4/+0 | |
* | | | | | | | | | Merge pull request #26392 from y-yagi/chage_descendants_to_public_api | Vipul A M | 2016-09-05 | 1 | -2/+15 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | change `Class#descendants` to public API [ci skip] | yuuji.yaginuma | 2016-09-05 | 1 | -2/+15 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #26377 from y-yagi/rename_test_method_to_avoid_overriding | Eileen M. Uchitelle | 2016-09-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | rename test method to avoid overriding | yuuji.yaginuma | 2016-09-03 | 1 | -1/+1 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #26383 from kamipo/remove_unnecessary_count_for_collection... | Eileen M. Uchitelle | 2016-09-04 | 2 | -36/+14 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove unnecessary `count` method for collection proxy | Ryuta Kamizono | 2016-09-04 | 2 | -36/+14 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #26384 from y-yagi/make_fixture_file_upload_in_integration... | Eileen M. Uchitelle | 2016-09-04 | 3 | -1/+43 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | make `fixture_file_upload` work in integration tests | yuuji.yaginuma | 2016-09-04 | 3 | -1/+43 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #26382 from naw/transaction-callback-docs | Vipul A M | 2016-09-04 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update docs for change in transaction callback exceptions | Nathan Wenneker | 2016-09-03 | 2 | -1/+9 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #26371 from duffyjp/master | Guillermo Iguaran | 2016-09-03 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Allow download of email attachments in the Mailer Preview template. | jpd800 | 2016-09-02 | 1 | -1/+4 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #26375 from kamipo/remove_blank_else_branch | Guillermo Iguaran | 2016-09-03 | 1 | -3/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove blank else branch | Ryuta Kamizono | 2016-09-03 | 1 | -3/+0 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #26381 from kamipo/extract_duplicated_create_for_association | Yves Senn | 2016-09-03 | 3 | -16/+8 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Extract duplicated `create` and `create!` definition for association | Ryuta Kamizono | 2016-09-03 | 3 | -16/+8 | |
|/ / / / / / / / |