Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | Restore action_cable.js UMD module support. Fixes #28366 | Javan Makhmali | 2017-03-11 | 3 | -1/+38 | |
* | | | | | | | | | | Merge pull request #28185 from renchap/system-testing-screenshot-output | Eileen M. Uchitelle | 2017-03-13 | 1 | -5/+34 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Dont always display inline screenshots in system testing (#28133) | Renaud Chaput | 2017-03-11 | 1 | -5/+34 | |
* | | | | | | | | | | | Merge pull request #28017 from mtsmfm/suppress-dep-warn | Matthew Draper | 2017-03-13 | 3 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Suppress deprecation warning `implementing to_yaml is deprecated` | Fumiaki MATSUSHIMA | 2017-02-15 | 3 | -0/+6 | |
* | | | | | | | | | | | | Merge pull request #28352 from alpaca-tc/fixes_renderer_with_defaults | Akira Matsuda | 2017-03-13 | 3 | -1/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fixes ActionController::Rendering#with_defaults | alpaca-tc | 2017-03-12 | 3 | -1/+17 | |
* | | | | | | | | | | | | Merge pull request #28371 from kamipo/simplify_count | Andrew White | 2017-03-12 | 1 | -7/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Simply forward `Calculations#count` to `Enumerable#count` | Ryuta Kamizono | 2017-03-10 | 1 | -7/+4 | |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Fix weird documentation line | Jon Moss | 2017-03-12 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge pull request #28372 from kamipo/delegate_as_json | Andrew White | 2017-03-12 | 3 | -6/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Simply delegate `as_json` to `records` | Ryuta Kamizono | 2017-03-10 | 3 | -6/+2 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Second editing pass on "Active Model Basics" guide | Jon Moss | 2017-03-12 | 1 | -16/+18 | |
* | | | | | | | | | | | | First editing pass on "Active Model Basics" guide | Jon Moss | 2017-03-12 | 1 | -11/+12 | |
* | | | | | | | | | | | | Add link to mentioned API [ci skip] (#28392) | Vipul A M | 2017-03-12 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge pull request #27152 from tjai89/patch-5 | Vipul A M | 2017-03-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add link to API documentation | Kirill Zhuravlov | 2016-11-23 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge pull request #28390 from bogdanvlviv/fix-typo-in-security-guide | Vipul A M | 2017-03-12 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix typo in the security guide | bogdanvlviv | 2017-03-12 | 1 | -2/+2 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | AS:Cache:MemoryStore doc fixes [ci skip] (#28389) | Vipul A M | 2017-03-12 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge pull request #27051 from devonestes/adding-cache-clear-docs | Vipul A M | 2017-03-12 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add missing documentation for MemoryStore#clear [ci skip] | Devon Estes | 2016-11-15 | 1 | -0/+2 | |
* | | | | | | | | | | | | Merge pull request #28378 from y-yagi/use_correct_variable_in_reverse_merge_test | Eileen M. Uchitelle | 2017-03-11 | 1 | -8/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Use correct value in `reverse_merge` test | yuuji.yaginuma | 2017-03-11 | 1 | -8/+4 | |
* | | | | | | | | | | | | Merge pull request #28380 from shime/docs-actionpack-api | Andrew White | 2017-03-11 | 1 | -4/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | [docs] remove unnecessary sentence | Hrvoje Šimić | 2017-03-11 | 1 | -4/+3 | |
|/ / / / / / / / / / / | ||||||
* / / / / / / / / / / | Fix indentation and formatting in CHANGELOGs [ci skip] | Ryuta Kamizono | 2017-03-11 | 2 | -19/+19 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Add @takkanm credits in the changelog [ci skip] | Rafael Mendonça França | 2017-03-10 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #28355 from Edouard-chin/reversemerge-for-strongparameters | Rafael Mendonça França | 2017-03-10 | 3 | -0/+48 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Added `reverse_merge`/`reverse_merge!` to AC::Parameters: | Edouard CHIN | 2017-03-09 | 3 | -0/+48 | |
* | | | | | | | | | | | Merge pull request #28373 from godfat/fix-cache-middleware-with-throw | Rafael França | 2017-03-10 | 2 | -4/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Make sure local cache cleared even it's throwing: | Lin Jen-Shin | 2017-03-10 | 2 | -4/+15 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #28370 from kamipo/remove_conditions_params_from_delete_all | Rafael França | 2017-03-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Remove conditions parameter from `NullRelation#delete_all` | Ryuta Kamizono | 2017-03-10 | 1 | -1/+1 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #28375 from baerjam/improve-testing-documentaion | Vipul A M | 2017-03-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Improve readability of testing guide [ci skip] | James Baer | 2017-03-10 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | / / | Add missing credit [ci skip] | Ryuta Kamizono | 2017-03-10 | 1 | -0/+2 | |
| |_|_|_|_|_|_|/ / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #28182 from y-yagi/show_correct_rails_commands | Kasper Timm Hansen | 2017-03-09 | 8 | -18/+47 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Show correct commands in help | yuuji.yaginuma | 2017-03-03 | 8 | -18/+47 | |
* | | | | | | | | | | [ci skip] Document read_encrypted_secrets config. | Kasper Timm Hansen | 2017-03-09 | 1 | -0/+8 | |
* | | | | | | | | | | Merge pull request #28351 from kamipo/deprecate_schema_migrations_table_name | Rafael Mendonça França | 2017-03-09 | 3 | -0/+13 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Deprecate `Migrator.schema_migrations_table_name` | Ryuta Kamizono | 2017-03-09 | 3 | -0/+13 | |
* | | | | | | | | | | | Merge pull request #28354 from kamipo/fix_select_with_block_and_dirty_target | Eileen M. Uchitelle | 2017-03-09 | 3 | -2/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix select with block doesn't return newly built records in has_many association | Ryuta Kamizono | 2017-03-09 | 3 | -2/+14 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'refactor-system-test-driver' | eileencodes | 2017-03-09 | 9 | -91/+64 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Call system test driver per-instance rather than globally | eileencodes | 2017-03-09 | 7 | -42/+36 | |
| * | | | | | | | | | | Refactor system test driver/browser | eileencodes | 2017-03-09 | 6 | -56/+35 | |
|/ / / / / / / / / / | ||||||
* / / / / / / / / / | force UTF-8 as external encoding in guides generation [ci skip] | Xavier Noria | 2017-03-09 | 1 | -3/+16 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #28340 from k3rni/document-am-default-url-options | Jon Moss | 2017-03-08 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Document using `default_url_options` in an ActionMailer class. | Krzysztof Zych | 2017-03-08 | 1 | -0/+3 |