aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | 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
* | | | | | | | | | Merge pull request #28354 from kamipo/fix_select_with_block_and_dirty_targetEileen M. Uchitelle2017-03-093-2/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix select with block doesn't return newly built records in has_many associationRyuta Kamizono2017-03-093-2/+14
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'refactor-system-test-driver'eileencodes2017-03-099-91/+64
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Call system test driver per-instance rather than globallyeileencodes2017-03-097-42/+36
| * | | | | | | | | Refactor system test driver/browsereileencodes2017-03-096-56/+35
|/ / / / / / / / /
* / / / / / / / / force UTF-8 as external encoding in guides generation [ci skip]Xavier Noria2017-03-091-3/+16
|/ / / / / / / /
* | | | | | | | Merge pull request #28340 from k3rni/document-am-default-url-optionsJon Moss2017-03-081-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Document using `default_url_options` in an ActionMailer class.Krzysztof Zych2017-03-081-0/+3
* | | | | | | | Merge pull request #28336 from tjschuck/test_delegated_params_methodsRafael França2017-03-081-0/+63
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Tests for delegated public methods on AC::ParametersT.J. Schuck2017-03-071-0/+63
* | | | | | | | Merge pull request #28338 from y-yagi/use_appropriate_type_in_generators_testKasper Timm Hansen2017-03-081-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use appropriate type in generators testyuuji.yaginuma2017-03-081-1/+1
* | | | | | | | params --> parametersJon Moss2017-03-071-2/+2
* | | | | | | | Merge pull request #28334 from tjschuck/document_delegated_params_methodsJon Moss2017-03-071-0/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | Document delegated public methods on AC::ParametersT.J. Schuck2017-03-071-0/+71
|/ / / / / / / /
* | | | | | | | Merge pull request #28289 from maicher/masterVipul A M2017-03-071-2/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Improve foreign key description in guides [ci skip]Krzysztof Maicher2017-03-061-2/+18
* | | | | | | | Check whether `Rails.application` defined before calling itAndrew White2017-03-072-1/+11