Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ensure query caching for `select_*` methods in connection adapters | Ryuta Kamizono | 2017-06-15 | 4 | -52/+41 |
| | |||||
* | Fix `Relation#exists?` queries with query cache | Ryuta Kamizono | 2017-06-15 | 2 | -1/+7 |
| | | | | | | | | If a connection adapter overrides `select_*` methods, query caching will doesn't work. This patch changes `select_value` to `select_one` in `Relation#exists?` to ensure query caching. Fixes #29449. | ||||
* | Merge pull request #29451 from vipulnsward/29441-flatten-default | Rafael França | 2017-06-14 | 2 | -1/+2 |
|\ | | | | | Allow translate default option to accept an array similar to i18n.t | ||||
| * | Allow translate default option to accept an array similar to i18n.t. Fixes ↵ | Vipul A M | 2017-06-15 | 2 | -1/+2 |
| | | | | | | | | #29441 | ||||
* | | Merge pull request #29378 from kamipo/avoid_overwriting_id_attribute_methods | Rafael França | 2017-06-14 | 4 | -19/+24 |
|\ \ | | | | | | | Avoid overwriting the methods of `AttributeMethods::PrimaryKey` | ||||
| * | | Avoid overwriting the methods of `AttributeMethods::PrimaryKey` | Ryuta Kamizono | 2017-06-07 | 4 | -19/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the methods of `AttributeMethods::PrimaryKey` are overwritten by `define_attribute_methods`. It will be broken if a table that customized primary key has non primary key id column. It should not be overwritten if a table has any primary key. Fixes #29350. | ||||
* | | | Merge pull request #29417 from ↵ | Matthew Draper | 2017-06-15 | 21 | -26/+26 |
|\ \ \ | | | | | | | | | | | | | | | | | bogdanvlviv/use-require_relative-instead-of_require-with-full-path Use `require_relative` instead of `require` with full path | ||||
| * | | | Use `require_relative` instead of `require` with full path | bogdanvlviv | 2017-06-14 | 21 | -26/+26 |
|/ / / | |||||
* | | | Merge pull request #29438 from koic/add_migration_compatibility_test | Rafael França | 2017-06-13 | 1 | -0/+15 |
|\ \ \ | |_|/ |/| | | Add test for backward compatibility when using change_table | ||||
| * | | Add test for backward compatibility when using change_table | Koichi ITO | 2017-06-13 | 1 | -0/+15 |
|/ / | |||||
* | | Merge pull request #29435 from y-yagi/fix_formatting_of_action_dispatch | Ryuta Kamizono | 2017-06-13 | 1 | -7/+7 |
|\ \ | | | | | | | Fix formatting of AD::FileHandler and AD::Static doc [ci skip] | ||||
| * | | Fix formatting of AD::FileHandler and AD::Static doc [ci skip] | yuuji.yaginuma | 2017-06-13 | 1 | -7/+7 |
|/ / | |||||
* | | Merge pull request #29289 from vergenzt/patch-1 | Vipul A M | 2017-06-12 | 1 | -0/+3 |
|\ \ | | | | | | | Add note to Railtie docs to use unique filenames | ||||
| * | | Add note to Railtie docs to use unique filenames | Tim Vergenz | 2017-06-12 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | The fact that the names need to be globally unique was not obvious to me, so I thought it'd be worth documenting. This not being clear was the cause of both ctran/annotate_models#468 and instructure/outrigger#1. [ci skip] | ||||
* | | | Merge pull request #29425 from gsamokovarov/drop-the-irb-term | Guillermo Iguaran | 2017-06-12 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Drop IRB out of the web-console Gemfile comment | ||||
| * | | | Drop IRB out of the web-console Gemfile comment | Genadi Samokovarov | 2017-06-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't provide exactly the same experience as IRB does, so let's not advertize it like that. We can say that it's an interactive console, without further references. I have also followed byebug's comment and changed the calling `console` part. Hopefully, this can hint that the invocation is not view specific and you can use it like the debugger statement. [ci skip] | ||||
* | | | | Add brakeman to guides/additional resources. Fixes #29383 [ci skip] (#29427) | Vipul A M | 2017-06-12 | 1 | -3/+4 |
| | | | | |||||
* | | | | Merge pull request #29422 from y-yagi/fix_default_message_encrypto_cipher | Ryuta Kamizono | 2017-06-12 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix `Message::Encryptor` default cipher [ci skip] | ||||
| * | | | | Fix `Message::Encryptor` default cipher [ci skip] | yuuji.yaginuma | 2017-06-12 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | Follow up of #29263 | ||||
* | | | | [ci skip] Add changelog entry for 6d402c6 | Kasper Timm Hansen | 2017-06-11 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | [ Assain Jaleel & Kasper Timm Hansen ] | ||||
* | | | | Merge pull request #29263 from assain/default_message_encryptor_to_gcm | Kasper Timm Hansen | 2017-06-11 | 5 | -5/+30 |
|\ \ \ \ | | | | | | | | | | | Default Message Encryptor Cipher to AES-256-GCM From AES-256-CBC | ||||
| * | | | | set message_encryptor default cipher to aes-256-gcm | Assain | 2017-06-12 | 5 | -5/+30 |
| | | | | | | | | | | | | | | | | | | | | - Introduce a method to select default cipher, and maintain backward compatibility | ||||
* | | | | | Merge pull request #29412 from y-yagi/fix_29014 | Kasper Timm Hansen | 2017-06-11 | 4 | -18/+28 |
|\ \ \ \ \ | | | | | | | | | | | | | Generate field ids in `collection_check_boxes` and `collection_radio_buttons` | ||||
| * | | | | | Generate field ids in `collection_check_boxes` and `collection_radio_buttons` | yuuji.yaginuma | 2017-06-11 | 4 | -18/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that the labels are linked up with the fields. Fixes #29014 | ||||
* | | | | | | Missing dots [ci skip] (#29414) | Vipul A M | 2017-06-11 | 1 | -4/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #29268 from gsamokovarov/delegate-missing-to-guides | Vipul A M | 2017-06-11 | 1 | -0/+21 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Document Module#delegate_missing_to in the guides [ci skip] | ||||
| * | | | | | Document Module#delegate_missing_to in the guides | Genadi Samokovarov | 2017-06-11 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a small section for it in the `Active Support Core Extensions` guide. [ci skip] | ||||
* | | | | | | Access EDITOR through Ruby's cross-platform ENV. | Kasper Timm Hansen | 2017-06-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the mistake of not using Ruby's ENV hash from the get go and get windows support. | ||||
* | | | | | | Cache: test coverage for cleanup behavior with local cache strategy | Eugene Kenny | 2017-06-10 | 2 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to pass `#cleanup` options through to `LocalCache#clear`. Fixes #29081. References #25628. | ||||
* | | | | | | Revert #25628. Incomplete change + needs a deprecation cycle. | Jeremy Daer | 2017-06-10 | 3 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/rails/rails/issues/29067#issuecomment-301342084 for rationale. This reverts commit b76f82d714e590c20370e72fa36fa574c4f17650. Fixes #29067. Fixes #29081. | ||||
* | | | | | | Merge pull request #29406 from y-yagi/remove_null_allowed_option | Ryuta Kamizono | 2017-06-10 | 1 | -2/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Remove `null_allowed` option from doc [ci skip] | ||||
| * | | | | | Remove `null_allowed` option from doc [ci skip] | yuuji.yaginuma | 2017-06-10 | 1 | -2/+1 |
|/ / / / / | | | | | | | | | | | | | | | | This option was added in b9fa354. But it does not seem to work. | ||||
* | | | | | Split up the cache test suite so it's easier to understand and extend (#29404) | Jeremy Daer | 2017-06-10 | 20 | -1359/+1383 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split up the caching tests as prep for adding a new cache store. Slices the mega test/caching_test.rb into behavior modules, concrete store tests, and cross-cutting store tests. Considering moving cache store behavior modules into lib/ so they may be used for acceptance testing by third parties. | ||||
* | | | | | Merge pull request #29403 from yasslab/add-backquote-to-counter-cache | Richard Schneeman | 2017-06-09 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | [ci skip] Add backquote to :counter_cache option | ||||
| * | | | | | [ci skip] Add backquote to :counter_cache option | Yohei Yasukawa | 2017-06-10 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Make i18n test match the description of the test | Guillermo Iguaran | 2017-06-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #29361 from metaskills/sqlserversetup-take2 | Guillermo Iguaran | 2017-06-09 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Ensure MSSQL password uses real ENV var. | ||||
| * | | | | | Ensure MSSQL password uses real ENV var. | Ken Collins | 2017-06-05 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #29398 from ydakuka/patch-1 | Richard Schneeman | 2017-06-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [ci skip] Fix another link in active_record_postgresql.md | ||||
| * | | | | | | [ci skip] Fix link in active_record_postgresql.md | Yauheni Dakuka | 2017-06-09 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #29397 from ydakuka/patch-1 | Vipul A M | 2017-06-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix link in active_record_postgresql.md [ci skip] | ||||
| * | | | | | | Fix link in active_record_postgresql.md | Yauheni Dakuka | 2017-06-09 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #29396 from ydakuka/patch-2 | Vipul A M | 2017-06-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | remove the extra comma in association_basics.md [ci skip] | ||||
| * | | | | | | remove the extra comma in association_basics.md | Yauheni Dakuka | 2017-06-09 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Don't rely on the @view_renderer being defined. | Kasper Timm Hansen | 2017-06-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | That won't be true for Action Pack and Action Mailer. | ||||
* | | | | | | Merge pull request https://github.com/rails/rails/pull/28637 from ↵ | Kasper Timm Hansen | 2017-06-08 | 6 | -33/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | st0012/fix-partial-cache-logging | ||||
* | | | | | | Use a hash to record every partial's cache hit status instead of sharing a ↵ | Stan Lo | 2017-06-08 | 7 | -3/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | boolean. | ||||
* | | | | | | Merge pull request #29388 from y-yagi/bump_capybara | Kasper Timm Hansen | 2017-06-08 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Bundle capybara 2.14.1 that includes fix for Ruby warnings | ||||
| * | | | | | | Bundle capybara 2.14.1 that includes fix for Ruby warnings | yuuji.yaginuma | 2017-06-08 | 1 | -2/+2 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Ref: https://github.com/teamcapybara/capybara/pull/1868 | ||||
* | | | | | | Merge pull request #29386 from y-yagi/remove_unreachable_code | Guillermo Iguaran | 2017-06-07 | 1 | -8/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove unreachable code |