Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ci skip] Remove superfluous paragraphs; fully qualify constants. | Kasper Timm Hansen | 2017-07-24 | 1 | -8/+2 |
| | | | | | | | The paragraphs retread ground covered by the title and the usage examples, so let's just remove them. [ Assain Jaleel & Kasper Timm Hansen ] | ||||
* | Merge pull request #29892 from assain/documenation_for_metadata | Kasper Timm Hansen | 2017-07-24 | 3 | -0/+100 |
|\ | | | | | Document metadata support for MessageEncryptor | ||||
| * | add to changelog: purpose and expiry support | Assain | 2017-07-24 | 1 | -0/+28 |
| | | | | | | | | [ci skip] | ||||
| * | document metadata support added to message encryptor and message verifier | Assain | 2017-07-24 | 2 | -0/+72 |
| | | | | | | | | [ci skip] | ||||
* | | Merge pull request #29860 from georgeclaghorn/travel-back-automatically | Rafael França | 2017-07-24 | 3 | -8/+8 |
|\ \ | | | | | | | Remove time stubs after each test | ||||
| * | | Remove time stubs after each test | George Claghorn | 2017-07-22 | 3 | -8/+8 |
| | | | | | | | | | | | | Reverts 7abb6e0. | ||||
* | | | Merge pull request #29820 from kirs/frozen-actioncable | Sean Griffin | 2017-07-23 | 81 | -1/+159 |
|\ \ \ | | | | | | | | | Use frozen string literal in actioncable/ | ||||
| * | | | Use frozen string literal in actioncable/ | Kir Shatrov | 2017-07-23 | 81 | -1/+159 |
| | | | | |||||
* | | | | Merge pull request #29900 from kirs/actionview-frozen-friendly | Sean Griffin | 2017-07-23 | 1 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | Make actionview ready for frozen strings | ||||
| * | | | Make actionview ready for frozen strings | Kir Shatrov | 2017-07-23 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #29901 from kirs/actioncable-frozen-friendly | Sean Griffin | 2017-07-23 | 1 | -1/+5 |
|\ \ \ \ | |/ / / |/| | | | Make actioncable ready for frozen strings | ||||
| * | | | Make actioncable ready for frozen strings | Kir Shatrov | 2017-07-23 | 1 | -1/+5 |
| | | | | |||||
* | | | | Merge pull request #29896 from kirs/frozen-actionmailer | Richard Schneeman | 2017-07-23 | 43 | -0/+84 |
|\ \ \ \ | |/ / / |/| | | | Use frozen string literal in actionmailer/ | ||||
| * | | | Use frozen string literal in actionmailer/ | Kir Shatrov | 2017-07-23 | 43 | -0/+84 |
|/ / / | |||||
* | | | Merge branch 'verify-release' | Kasper Timm Hansen | 2017-07-23 | 4 | -96/+138 |
|\ \ \ | |||||
| * | | | Update release instructions in light of new tasks. | Kasper Timm Hansen | 2017-07-22 | 1 | -44/+46 |
| | | | | |||||
| * | | | Support multiple versions in release announcement. | Kasper Timm Hansen | 2017-07-22 | 2 | -51/+67 |
| | | | | | | | | | | | | | | | | | | | | So releasing 5.1 and 5.0 together won't require manual copy and paste. | ||||
| * | | | Add task to verify a release. | Kasper Timm Hansen | 2017-07-22 | 2 | -1/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically revises the release flow to: * Update the version in RAILS_VERSION + rake changelog:header * Run rake all:verify (click around in the booted app) * If that checks out, run rake release. | ||||
* | | | | Merge pull request #29867 from koic/fix_a_failed_ar_test_when_using_oracle | Kasper Timm Hansen | 2017-07-23 | 1 | -2/+10 |
|\ \ \ \ | | | | | | | | | | | Fix a failued AR test when using OracleAdapter | ||||
| * | | | | Fix a failued AR test when using OracleAdapter | Koichi ITO | 2017-07-20 | 1 | -2/+10 |
| | | | | | |||||
* | | | | | Let Metadata instance handle purpose coercion. | Kasper Timm Hansen | 2017-07-23 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | [ Assain Jaleel & Kasper Timm Hansen ] | ||||
* | | | | | Remove dependency on `from_now` extension. | Kasper Timm Hansen | 2017-07-23 | 1 | -1/+1 |
| |_|_|/ |/| | | | | | | | | | | | [ Assain Jaleel & Kasper Timm Hansen ] | ||||
* | | | | Merge pull request #29768 from janpieper/sort-enabled-extensions-in-dump | Eileen M. Uchitelle | 2017-07-22 | 2 | -1/+15 |
|\ \ \ \ | |_|/ / |/| | | | Sort enabled adapter extensions in schema dump | ||||
| * | | | Sort enabled adapter extensions in schema dump | Jan Pieper | 2017-07-12 | 2 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The list of enabled adapter extensions in the schema dump isn't sorted by default, so it may happen that the sorting changes over time. If you're using a VCS, a change to the sorting results in a diff without any real change. Sorting the list should solve this problem. | ||||
* | | | | Merge pull request #29870 from kamipo/use_true_false_literals | Sean Griffin | 2017-07-22 | 2 | -14/+4 |
|\ \ \ \ | | | | | | | | | | | Use `TRUE` and `FALSE` boolean literals for MySQL | ||||
| * | | | | Use `TRUE` and `FALSE` boolean literals for MySQL | Ryuta Kamizono | 2017-07-20 | 2 | -14/+6 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | Since #29699, abstract boolean serialization has been changed to use `TRUE` and `FALSE` literals. MySQL also support the literals. So we can use the abstract boolean serialization even for MySQL. | ||||
* | | | | Merge pull request #29858 from ↵ | Rafael França | 2017-07-21 | 2 | -19/+18 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | y-yagi/use_argument_error_instead_of_own_error_class Use `ArgumentError` instead of own error class | ||||
| * | | | | Use `ArgumentError` instead of own error class | yuuji.yaginuma | 2017-07-20 | 2 | -19/+18 |
| |/ / / | | | | | | | | | | | | | | | | | If the argument is invalid, I think that it is more intuitive to use `ArgumentError` than its own error class. | ||||
* | | | | Merge pull request #29869 from kamipo/make_type_map_to_private | Rafael França | 2017-07-21 | 9 | -31/+28 |
|\ \ \ \ | | | | | | | | | | | Make `type_map` to private because it is only used in the connection adapter | ||||
| * | | | | Make `type_map` to private because it is only used in the connection adapter | Ryuta Kamizono | 2017-07-20 | 9 | -31/+28 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | `type_map` is an internal API and it is only used in the connection adapter. And also, some type map initializer methods requires passed `type_map`, but those instances already has `type_map` in itself. So we don't need explicit passing `type_map` to the initializers. | ||||
* | | | | Merge pull request #29884 from padi/update_rails_5_upgrade_guide | Rafael França | 2017-07-21 | 2 | -2/+12 |
|\ \ \ \ | | | | | | | | | | | Updates Rails upgrade guide on `ActionView::Helpers::RecordTagHelper` | ||||
| * | | | | Suppress documentation for content_tag_for and div_for since they were ↵ | Marc Rendl Ignacio | 2017-07-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | removed already | ||||
| * | | | | Updates Rails upgrade guide for 4.2 to 5.0 regarding the removal of ↵ | Marc Rendl Ignacio | 2017-07-21 | 1 | -0/+10 |
| | |/ / | |/| | | | | | | | | | | `ActionView::Helpers::RecordTagHelper` | ||||
* | | | | Merge pull request #29885 from freeletics/fix-false-positive-test | Rafael França | 2017-07-21 | 1 | -11/+11 |
|\ \ \ \ | | | | | | | | | | | Fix false positive test related to wrong app root path. | ||||
| * | | | | Fix false positive test related to wrong app root path. | Wojciech Wnętrzak | 2017-07-21 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without setting root config, `config.paths["config/secrets"]` located in https://github.com/rails/rails/blob/84eb498f84ebc5d1be0b0db6f7bca9da3d679ca6/railties/lib/rails/application.rb#L390 always returned empty list. | ||||
* | | | | | Merge pull request #29855 from lugray/has_one_destroyed_by_association | Rafael França | 2017-07-21 | 3 | -0/+42 |
|\ \ \ \ \ | | | | | | | | | | | | | Match destroyed_by_association for has_one to has_many | ||||
| * | | | | | Match destroyed_by_association for has_one to has_many | Lisa Ugray | 2017-07-21 | 3 | -0/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a has_many association is destroyed by `dependent: destroy`, destroyed_by_association is set to the reflection, and this can be checked in callbacks. This matches that behaviour for has_one associations. | ||||
* | | | | | | Merge pull request #29732 from kirs/frozen-activerecord | Rafael França | 2017-07-21 | 678 | -11/+1367 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use frozen-string-literal in ActiveRecord | ||||
| * | | | | | | Reset column information after schema changed | yuuji.yaginuma | 2017-07-20 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following failures. https://travis-ci.org/rails/rails/jobs/253990014 | ||||
| * | | | | | | Use frozen-string-literal in ActiveRecord | Kir Shatrov | 2017-07-19 | 677 | -11/+1363 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Revert "Extract `bind_param` and `bind_attribute` into `ActiveRecord::TestCase`" | Sean Griffin | 2017-07-21 | 13 | -46/+56 |
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b6ad4052d18e4b29b8a092526c2beef013e2bf4f. This is not something that the majority of Active Record should be testing or care about. We should look at having fewer places rely on these details, not make it easier to rely on them. | ||||
* | | | | | Merge pull request #29882 from y-yagi/fix_ujs_test_postprocessing | Kasper Timm Hansen | 2017-07-21 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove log directory in test postprocessing | ||||
| * | | | | | Remove log directory in test postprocessing | yuuji.yaginuma | 2017-07-21 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | The "log" is directory. So it is necessary to use `FileUtils.rm_rf`. | ||||
* | | | | | Merge pull request #29872 from padi/add_jquery_vendor_for_ujs_testing | Guillermo Iguaran | 2017-07-20 | 2 | -1/+9832 |
|\ \ \ \ \ | | | | | | | | | | | | | Add jQuery to test/ujs/vendor files for testing rails-ujs | ||||
| * | | | | | Add jQuery to test vendor files | Marc Rendl Ignacio | 2017-07-20 | 2 | -1/+9832 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | ... so that we can run most, if not all, of rails-ujs tests without necessarily requiring an internet connection. | ||||
* | | | | | Merge pull request #29851 from printercu/patch-1 | Eileen M. Uchitelle | 2017-07-20 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Make `rails yarn:install` ignore dev dependencies | ||||
| * | | | | Make `rails yarn:install` ignore dev dependencies | printercu | 2017-07-19 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #29854 from assain/add_metadata_to_message_verifier | Kasper Timm Hansen | 2017-07-19 | 2 | -6/+48 |
|\ \ \ \ | | | | | | | | | | | Add Expiry & Purpose to Message Verifier | ||||
| * | | | | add metadata support to message verifier | Assain | 2017-07-19 | 2 | -6/+48 |
|/ / / / | |||||
* / / / | Move back to @matthewd's close io fixed rb-inotify. | Kasper Timm Hansen | 2017-07-19 | 2 | -2/+13 |
|/ / / |