aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Fix Action Cable README [ci skip]Rafael Mendonça França2016-06-261-5/+14
* | | | Merge pull request #25534 from kamipo/remove_conflict_lineRafael França2016-06-261-1/+0
|\ \ \ \
| * | | | Remove conflict line [ci skip]Ryuta Kamizono2016-06-271-1/+0
|/ / / /
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-06-263-6/+151
|\ \ \ \
| * | | | Fix and make example generic in README as well [ci skip]Vipul A M2016-06-151-3/+3
| * | | | Make log tags example for ACa more generic and not BC specific [ci skip]Vipul A M2016-06-151-3/+4
| * | | | [ci skip] When instance_reader is false, attribute can still be assigned by t...Prathamesh Sonpatki2016-06-151-1/+2
| * | | | Action Cable routes are enabled by default now [ci skip]Prathamesh Sonpatki2016-06-101-5/+0
| * | | | Expand on AC introduction list [ci skip]Vipul A M2016-06-071-0/+2
* | | | | Merge pull request #25533 from infertux/fix_typoKasper Timm Hansen2016-06-261-1/+1
|\ \ \ \ \
| * | | | | Fix typo in exception class nameCédric Félizard2016-06-261-1/+1
|/ / / / /
* | | | | Merge pull request #25526 from tricknotes/pathname-as-jsonGodfrey Chan2016-06-262-0/+9
|\ \ \ \ \
| * | | | | Define `Pathname#as_json`Ryunosuke Sato2016-06-252-0/+9
* | | | | | Merge pull request #25530 from y-yagi/update_routes_exampleJon Moss2016-06-251-5/+0
|\ \ \ \ \ \
| * | | | | | remove unecessary comments [ci skip]yuuji.yaginuma2016-06-261-5/+0
* | | | | | | Merge pull request #25524 from kamipo/remove_unnecessary_assert_valid_defaultSean Griffin2016-06-252-14/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove unnecessary `assert_valid_default`Ryuta Kamizono2016-06-252-14/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #25528 from Gaurav2728/test_may_not_using_these_filesSean Griffin2016-06-251-3/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | client test have not using Pathname and hashwithindifferent accessGaurav Sharma2016-06-261-3/+0
|/ / / / / /
* / / / / / Tiny documentation fixes [ci skip]Robin Dupret2016-06-252-8/+8
|/ / / / /
* | | | | Merge pull request #25350 from tricknotes/uri-generic-as-jsonGodfrey Chan2016-06-252-0/+9
|\ \ \ \ \
| * | | | | Define `URI::Generic#as_json`Ryunosuke Sato2016-06-252-0/+9
* | | | | | Extract method to share path expansion logic.Kasper Timm Hansen2016-06-251-11/+16
* | | | | | Simplify `as` passed check.Kasper Timm Hansen2016-06-251-1/+1
* | | | | | Merge pull request #25435 from y-yagi/make_as_option_work_with_get_parametersKasper Timm Hansen2016-06-252-2/+18
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | make `as` option work with get parametersyuuji.yaginuma2016-06-252-2/+18
* | | | | | Merge pull request #23011 from arnvald/bugfix/correctly_parse_dateGodfrey Chan2016-06-253-7/+25
|\ \ \ \ \ \
| * | | | | | Use correct timezone when parsing date in jsonGrzegorz Witek2016-01-223-7/+25
* | | | | | | Merge pull request #25287 from marekkirejczyk/fix_25267Godfrey Chan2016-06-252-1/+8
|\ \ \ \ \ \ \
| * | | | | | | Make select_year work with include_position: true option, fix #25267Marek2016-06-052-1/+8
* | | | | | | | Merge pull request #25476 from maclover7/jm-docs-dep-loadingJon Moss2016-06-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update grammar for `config.enable_dependency_loading` docsJon Moss2016-06-241-1/+1
* | | | | | | | | Merge pull request #25517 from alexcameron89/per_thread_registryJon Moss2016-06-241-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | [ci skip] Add link to method referenced in ActiveSupport::PerThreadRegistryAlex Kitchens2016-06-241-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #25514 from maclover7/jm-ar-nodocKasper Timm Hansen2016-06-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | nodoc `ActiveRecord::AttributeSet::YAMLEncoder`Jon Moss2016-06-241-1/+1
|/ / / / / / / /
* | | | | | | | Revert "[ci skip] better docs for ActiveRecord::AttributeSet::YAMLEncoder#dec...Jon Moss2016-06-241-17/+0
* | | | | | | | Merge pull request #25506 from y-yagi/return_correct_from_enum_typeSean Griffin2016-06-242-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | return correct type from `EnumType`yuuji.yaginuma2016-06-242-0/+6
* | | | | | | | | Merge pull request #25470 from alexcameron89/masterVipul A M2016-06-241-1/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] Add additional documentation to ActiveModel::ErrorsAlex Kitchens2016-06-221-1/+12
* | | | | | | | | | Merge pull request #25502 from Edouard-chin/exclusive-scope-test-residueRafael França2016-06-241-6/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removed a forgotten `with_exclusive_scope` test:Edouard CHIN2016-06-241-6/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #25478 from maclover7/jm-permitted-falseRafael França2016-06-232-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | `params.permitted?` is false by defaultJon Moss2016-06-232-0/+8
* | | | | | | | | | | Merge pull request #25486 from alexcameron89/inheritanceJon Moss2016-06-231-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ci skip] Update Documentation on ActiveRecord::InheritanceAlex Kitchens2016-06-231-1/+2
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #25485 from georgemillo/patch-1Jon Moss2016-06-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | English fixGeorge Millo2016-06-231-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #25480 from kmcphillips/masterRafael França2016-06-222-0/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |