aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Small grammar change + new line for "fixes"Jon Moss2017-03-131-2/+4
* Small grammar changeJon Moss2017-03-131-3/+1
* Merge pull request #28404 from olimart/masterJon Moss2017-03-131-1/+1
|\
| * Fix Typo [ci skip]Olivier2017-03-131-1/+1
|/
* Fix HTTPS grammarJon Moss2017-03-131-4/+4
* Merge pull request #28381 from shime/docs-action-controller-baseVipul A M2017-03-1321-55/+55
|\
| * [docs] fix ActionController documentationHrvoje Šimić2017-03-1221-55/+55
* | Merge pull request #28385 from javan/actioncable/fix-npm-packageGuillermo Iguaran2017-03-133-1/+38
|\ \
| * | Restore action_cable.js UMD module support. Fixes #28366Javan Makhmali2017-03-113-1/+38
* | | Merge pull request #28185 from renchap/system-testing-screenshot-outputEileen M. Uchitelle2017-03-131-5/+34
|\ \ \
| * | | Dont always display inline screenshots in system testing (#28133)Renaud Chaput2017-03-111-5/+34
* | | | Merge pull request #28017 from mtsmfm/suppress-dep-warnMatthew Draper2017-03-133-0/+6
|\ \ \ \
| * | | | Suppress deprecation warning `implementing to_yaml is deprecated`Fumiaki MATSUSHIMA2017-02-153-0/+6
* | | | | Merge pull request #28352 from alpaca-tc/fixes_renderer_with_defaultsAkira Matsuda2017-03-133-1/+17
|\ \ \ \ \
| * | | | | Fixes ActionController::Rendering#with_defaultsalpaca-tc2017-03-123-1/+17
* | | | | | Merge pull request #28371 from kamipo/simplify_countAndrew White2017-03-121-7/+4
|\ \ \ \ \ \
| * | | | | | Simply forward `Calculations#count` to `Enumerable#count`Ryuta Kamizono2017-03-101-7/+4
* | | | | | | Fix weird documentation lineJon Moss2017-03-121-1/+1
* | | | | | | Merge pull request #28372 from kamipo/delegate_as_jsonAndrew White2017-03-123-6/+2
|\ \ \ \ \ \ \
| * | | | | | | Simply delegate `as_json` to `records`Ryuta Kamizono2017-03-103-6/+2
| |/ / / / / /
* | | | | | | Second editing pass on "Active Model Basics" guideJon Moss2017-03-121-16/+18
* | | | | | | First editing pass on "Active Model Basics" guideJon Moss2017-03-121-11/+12
* | | | | | | Add link to mentioned API [ci skip] (#28392)Vipul A M2017-03-121-1/+1
* | | | | | | Merge pull request #27152 from tjai89/patch-5Vipul A M2017-03-121-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add link to API documentationKirill Zhuravlov2016-11-231-1/+1
* | | | | | | Merge pull request #28390 from bogdanvlviv/fix-typo-in-security-guideVipul A M2017-03-121-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in the security guidebogdanvlviv2017-03-121-2/+2
|/ / / / / / /
* | | | | | | AS:Cache:MemoryStore doc fixes [ci skip] (#28389)Vipul A M2017-03-121-1/+1
* | | | | | | Merge pull request #27051 from devonestes/adding-cache-clear-docsVipul A M2017-03-121-0/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add missing documentation for MemoryStore#clear [ci skip]Devon Estes2016-11-151-0/+2
* | | | | | | Merge pull request #28378 from y-yagi/use_correct_variable_in_reverse_merge_testEileen M. Uchitelle2017-03-111-8/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Use correct value in `reverse_merge` testyuuji.yaginuma2017-03-111-8/+4
* | | | | | | Merge pull request #28380 from shime/docs-actionpack-apiAndrew White2017-03-111-4/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | [docs] remove unnecessary sentenceHrvoje Šimić2017-03-111-4/+3
|/ / / / / /
* / / / / / Fix indentation and formatting in CHANGELOGs [ci skip]Ryuta Kamizono2017-03-112-19/+19
|/ / / / /
* | | | | Add @takkanm credits in the changelog [ci skip]Rafael Mendonça França2017-03-101-1/+1
* | | | | Merge pull request #28355 from Edouard-chin/reversemerge-for-strongparametersRafael Mendonça França2017-03-103-0/+48
|\ \ \ \ \
| * | | | | Added `reverse_merge`/`reverse_merge!` to AC::Parameters:Edouard CHIN2017-03-093-0/+48
* | | | | | Merge pull request #28373 from godfat/fix-cache-middleware-with-throwRafael França2017-03-102-4/+15
|\ \ \ \ \ \
| * | | | | | Make sure local cache cleared even it's throwing:Lin Jen-Shin2017-03-102-4/+15
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #28370 from kamipo/remove_conditions_params_from_delete_allRafael França2017-03-101-1/+1
|\ \ \ \ \ \
| * | | | | | Remove conditions parameter from `NullRelation#delete_all`Ryuta Kamizono2017-03-101-1/+1
| |/ / / / /
* | | | | | Merge pull request #28375 from baerjam/improve-testing-documentaionVipul A M2017-03-111-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Improve readability of testing guide [ci skip]James Baer2017-03-101-1/+1
|/ / / / /
* | | | | Add missing credit [ci skip]Ryuta Kamizono2017-03-101-0/+2
* | | | | Merge pull request #28182 from y-yagi/show_correct_rails_commandsKasper Timm Hansen2017-03-098-18/+47
|\ \ \ \ \
| * | | | | Show correct commands in helpyuuji.yaginuma2017-03-038-18/+47
* | | | | | [ci skip] Document read_encrypted_secrets config.Kasper Timm Hansen2017-03-091-0/+8
* | | | | | Merge pull request #28351 from kamipo/deprecate_schema_migrations_table_nameRafael Mendonça França2017-03-093-0/+13
|\ \ \ \ \ \
| * | | | | | Deprecate `Migrator.schema_migrations_table_name`Ryuta Kamizono2017-03-093-0/+13