Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Fix Action Cable README [ci skip] | Rafael Mendonça França | 2016-06-26 | 1 | -5/+14 | |
* | | | | Merge pull request #25534 from kamipo/remove_conflict_line | Rafael França | 2016-06-26 | 1 | -1/+0 | |
|\ \ \ \ | ||||||
| * | | | | Remove conflict line [ci skip] | Ryuta Kamizono | 2016-06-27 | 1 | -1/+0 | |
|/ / / / | ||||||
* | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2016-06-26 | 3 | -6/+151 | |
|\ \ \ \ | ||||||
| * | | | | Fix and make example generic in README as well [ci skip] | Vipul A M | 2016-06-15 | 1 | -3/+3 | |
| * | | | | Make log tags example for ACa more generic and not BC specific [ci skip] | Vipul A M | 2016-06-15 | 1 | -3/+4 | |
| * | | | | [ci skip] When instance_reader is false, attribute can still be assigned by t... | Prathamesh Sonpatki | 2016-06-15 | 1 | -1/+2 | |
| * | | | | Action Cable routes are enabled by default now [ci skip] | Prathamesh Sonpatki | 2016-06-10 | 1 | -5/+0 | |
| * | | | | Expand on AC introduction list [ci skip] | Vipul A M | 2016-06-07 | 1 | -0/+2 | |
* | | | | | Merge pull request #25533 from infertux/fix_typo | Kasper Timm Hansen | 2016-06-26 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix typo in exception class name | Cédric Félizard | 2016-06-26 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #25526 from tricknotes/pathname-as-json | Godfrey Chan | 2016-06-26 | 2 | -0/+9 | |
|\ \ \ \ \ | ||||||
| * | | | | | Define `Pathname#as_json` | Ryunosuke Sato | 2016-06-25 | 2 | -0/+9 | |
* | | | | | | Merge pull request #25530 from y-yagi/update_routes_example | Jon Moss | 2016-06-25 | 1 | -5/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | remove unecessary comments [ci skip] | yuuji.yaginuma | 2016-06-26 | 1 | -5/+0 | |
* | | | | | | | Merge pull request #25524 from kamipo/remove_unnecessary_assert_valid_default | Sean Griffin | 2016-06-25 | 2 | -14/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove unnecessary `assert_valid_default` | Ryuta Kamizono | 2016-06-25 | 2 | -14/+0 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #25528 from Gaurav2728/test_may_not_using_these_files | Sean Griffin | 2016-06-25 | 1 | -3/+0 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | client test have not using Pathname and hashwithindifferent access | Gaurav Sharma | 2016-06-26 | 1 | -3/+0 | |
|/ / / / / / | ||||||
* / / / / / | Tiny documentation fixes [ci skip] | Robin Dupret | 2016-06-25 | 2 | -8/+8 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #25350 from tricknotes/uri-generic-as-json | Godfrey Chan | 2016-06-25 | 2 | -0/+9 | |
|\ \ \ \ \ | ||||||
| * | | | | | Define `URI::Generic#as_json` | Ryunosuke Sato | 2016-06-25 | 2 | -0/+9 | |
* | | | | | | Extract method to share path expansion logic. | Kasper Timm Hansen | 2016-06-25 | 1 | -11/+16 | |
* | | | | | | Simplify `as` passed check. | Kasper Timm Hansen | 2016-06-25 | 1 | -1/+1 | |
* | | | | | | Merge pull request #25435 from y-yagi/make_as_option_work_with_get_parameters | Kasper Timm Hansen | 2016-06-25 | 2 | -2/+18 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | make `as` option work with get parameters | yuuji.yaginuma | 2016-06-25 | 2 | -2/+18 | |
* | | | | | | Merge pull request #23011 from arnvald/bugfix/correctly_parse_date | Godfrey Chan | 2016-06-25 | 3 | -7/+25 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use correct timezone when parsing date in json | Grzegorz Witek | 2016-01-22 | 3 | -7/+25 | |
* | | | | | | | Merge pull request #25287 from marekkirejczyk/fix_25267 | Godfrey Chan | 2016-06-25 | 2 | -1/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Make select_year work with include_position: true option, fix #25267 | Marek | 2016-06-05 | 2 | -1/+8 | |
* | | | | | | | | Merge pull request #25476 from maclover7/jm-docs-dep-loading | Jon Moss | 2016-06-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update grammar for `config.enable_dependency_loading` docs | Jon Moss | 2016-06-24 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #25517 from alexcameron89/per_thread_registry | Jon Moss | 2016-06-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | [ci skip] Add link to method referenced in ActiveSupport::PerThreadRegistry | Alex Kitchens | 2016-06-24 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #25514 from maclover7/jm-ar-nodoc | Kasper Timm Hansen | 2016-06-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | nodoc `ActiveRecord::AttributeSet::YAMLEncoder` | Jon Moss | 2016-06-24 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Revert "[ci skip] better docs for ActiveRecord::AttributeSet::YAMLEncoder#dec... | Jon Moss | 2016-06-24 | 1 | -17/+0 | |
* | | | | | | | | Merge pull request #25506 from y-yagi/return_correct_from_enum_type | Sean Griffin | 2016-06-24 | 2 | -0/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | return correct type from `EnumType` | yuuji.yaginuma | 2016-06-24 | 2 | -0/+6 | |
* | | | | | | | | | Merge pull request #25470 from alexcameron89/master | Vipul A M | 2016-06-24 | 1 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | [ci skip] Add additional documentation to ActiveModel::Errors | Alex Kitchens | 2016-06-22 | 1 | -1/+12 | |
* | | | | | | | | | | Merge pull request #25502 from Edouard-chin/exclusive-scope-test-residue | Rafael França | 2016-06-24 | 1 | -6/+0 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Removed a forgotten `with_exclusive_scope` test: | Edouard CHIN | 2016-06-24 | 1 | -6/+0 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #25478 from maclover7/jm-permitted-false | Rafael França | 2016-06-23 | 2 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | `params.permitted?` is false by default | Jon Moss | 2016-06-23 | 2 | -0/+8 | |
* | | | | | | | | | | | Merge pull request #25486 from alexcameron89/inheritance | Jon Moss | 2016-06-23 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | [ci skip] Update Documentation on ActiveRecord::Inheritance | Alex Kitchens | 2016-06-23 | 1 | -1/+2 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #25485 from georgemillo/patch-1 | Jon Moss | 2016-06-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | English fix | George Millo | 2016-06-23 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #25480 from kmcphillips/master | Rafael França | 2016-06-22 | 2 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | |