Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #36120 from kamipo/should_maintain_join_type | Ryuta Kamizono | 2019-04-27 | 6 | -17/+29 |
|\ | | | | | Fix merging left_joins to maintain its own `join_type` context | ||||
| * | Fix merging left_joins to maintain its own `join_type` context | Ryuta Kamizono | 2019-04-27 | 6 | -17/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression for #35864. Usually, stashed joins (mainly eager loading) are performed as LEFT JOINs. But the case of merging joins/left_joins of different class, that (stashed) joins are performed as the same `join_type` as the parent context for now. Since #35864, both (joins/left_joins) stashed joins might be contained in `joins_values`, so each stashed joins should maintain its own `join_type` context. Fixes #36103. | ||||
* | | Fallback to spawn instead of fork in jruby (#36111) | Guilherme Mansur | 2019-04-26 | 1 | -8/+12 |
| | | | | | | | | | | | | | | | | * Fallback to spawn instead of fork in jruby This commit: b342db6 introduced a `fork` fork when running the railties tests since this is not supported in jruby we fallback to using spawn. Fixes: https://github.com/rails/rails/issues/35900 | ||||
* | | Frozen truncate (#36109) | Jordan Thomas | 2019-04-26 | 3 | -1/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add test asserting truncate returns unfrozen string * Ensure strings returned from truncate are not frozen This fixes an issue where strings too short to be truncated were returned unfrozen, where as long-enough strings were returned frozen. Now retuned strings will not be frozen whether or not the string returned was shortened. * Update changelog w/ new truncate behavior description [Jordan Thomas + Rafael Mendonça França] | ||||
* | | Merge pull request #36107 from alexcameron89/add_more_release_notes | प्रथमेश Sonpatki | 2019-04-26 | 1 | -0/+68 |
|\ \ | | | | | | | Add 6.0 Release Notes for Action Pack | ||||
| * | | [ci skip] Add 6.0 Release Notes for Action Pack | Alex Kitchens | 2019-04-26 | 1 | -0/+68 |
| | | | | | | | | | | | | | | | | | | I've gone through the CHANGELOG for Action Pack, pulled out anything that was backported, rephrased some of the descriptions and found their PR's/commits as links. | ||||
* | | | Halve string allocations in S3 streaming and partial downloads | George Claghorn | 2019-04-26 | 1 | -2/+2 |
| | | | | | | | | | | | | See 19770d6. | ||||
* | | | Merge pull request #36104 from prathamesh-sonpatki/bump-bootsnap | Kasper Timm Hansen | 2019-04-26 | 3 | -9/+9 |
|\ \ \ | |_|/ |/| | | Bump bootsnap to a version with disables iseq_cache for Ruby 2.5 | ||||
| * | | Bump bootsnap to a version with disables iseq_cache for Ruby 2.5 | Prathamesh Sonpatki | 2019-04-26 | 3 | -9/+9 |
| | | | | | | | | | | | | - Refs https://github.com/Shopify/bootsnap/pull/257 | ||||
* | | | Merge pull request #36098 from michaelrbock/patch-1 | Rafael França | 2019-04-25 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | Fixes grammar in comments on tag_name and tag_id | ||||
| * | | Fixes grammar in comments on tag_name and tag_id | Michael Bock | 2019-04-25 | 1 | -2/+2 |
| |/ | |||||
* | | [ci skip] Get npm just the way they like it | Kasper Timm Hansen | 2019-04-25 | 1 | -1/+1 |
| | | |||||
* | | [ci skip] Remove à la just like that. | Kasper Timm Hansen | 2019-04-25 | 1 | -1/+2 |
| | | |||||
* | | [ci skip] Documentation pass of upgrading guide. | Kasper Timm Hansen | 2019-04-25 | 1 | -14/+14 |
|/ | |||||
* | Update bug report templates | Ryuta Kamizono | 2019-04-25 | 5 | -8/+8 |
| | | | | Bump gem version to 6.0.0.rc1. | ||||
* | Merge pull request #36090 from prathamesh-sonpatki/fix-yarn-lock | Ryuta Kamizono | 2019-04-25 | 1 | -0/+7 |
|\ | | | | | Fix outdated yarn.lock | ||||
| * | Fix outdated yarn.lock | Prathamesh Sonpatki | 2019-04-25 | 1 | -0/+7 |
|/ | |||||
* | Change the deprecation for Enumerating ActiveModel::Errors to Rails 6.1 ↵ | Abhay Nikam | 2019-04-25 | 1 | -5/+5 |
| | | | | | | | | instead of 6.0 (#36087) * Change the deprecation for Enumerating ActiveModel::Errors to Rails 6.1 instead of 6.0 * Changed the deprecation message for ActiveModel::Errors methods: slice, values, keys and to_xml | ||||
* | Merge pull request #36086 from ↵ | Ryuta Kamizono | 2019-04-25 | 1 | -2/+25 |
|\ | | | | | | | | | abhaynikam/35869-add-documentation-for-has-one-option Adds documentation for has_one touch option after #35869 [ci skip] | ||||
| * | Adds documentation for has_one touch option after #35869 [ci skip] | Abhay Nikam | 2019-04-25 | 1 | -2/+25 |
|/ | |||||
* | Merge pull request #32313 from lulalala/model_error_as_object | Rafael França | 2019-04-24 | 22 | -230/+956 |
|\ | | | | | Model error as object | ||||
| * | Spec for display original raw type in details | lulalala | 2019-03-31 | 1 | -0/+18 |
| | | |||||
| * | Set default array to details | lulalala | 2019-03-31 | 2 | -1/+15 |
| | | | | | | | | maintaining behavior errors.details[:foo].any? | ||||
| * | Fix messages[]= does not override value | lulalala | 2019-03-31 | 2 | -0/+9 |
| | | |||||
| * | Freeze DeprecationHandling array and hash | lulalala | 2019-03-31 | 1 | -13/+20 |
| | | |||||
| * | Fix equality comparison raising error bug | lulalala | 2019-03-31 | 2 | -1/+8 |
| | | |||||
| * | Fix spec | lulalala | 2019-03-31 | 1 | -1/+1 |
| | | |||||
| * | Assert deprecation | lulalala | 2019-03-31 | 2 | -8/+8 |
| | | |||||
| * | Split messages and to_hash | lulalala | 2019-03-31 | 1 | -18/+21 |
| | | | | | | | | | | | | Fix double wrapping issue Revert messages_for wrapping. It's a new method so no need to put deprecation warnings. | ||||
| * | Raise deprecation for calling `[:f] = 'b'` or `[:f] << 'b'` | lulalala | 2019-03-31 | 13 | -50/+155 |
| | | | | | | | | Revert some tests to ensure back compatibility | ||||
| * | Add deprecation to slice! | lulalala | 2019-03-31 | 2 | -5/+5 |
| | | |||||
| * | Nested attribute error's attribute name to use different key: | lulalala | 2019-03-31 | 1 | -1/+1 |
| | | | | | | | | To keep the same as SHA dcafe995bfe51e53dd04607956be9b54073e9cb6 | ||||
| * | String override options in #import to convert to symbol | lulalala | 2019-03-31 | 1 | -0/+5 |
| | | |||||
| * | Allow errors to remove duplicates, and ensure cyclic associations w/ ↵ | lulalala | 2019-03-31 | 4 | -4/+37 |
| | | | | | | | | | | autosave duplicate errors can be removed See SHA 7550f0a016ee6647aaa76c0c0ae30bebc3867288 | ||||
| * | Add messages_for | lulalala | 2019-03-31 | 1 | -1/+7 |
| | | |||||
| * | Add a transitional method `objects`, for accessing the array directly. | lulalala | 2019-03-31 | 2 | -6/+7 |
| | | | | | | | | This is because we try to accommodate old hash behavior, so `first` and `last` now does not return Error object. | ||||
| * | Backward compatibility for errors.collect/select etc. | lulalala | 2019-03-31 | 1 | -2/+2 |
| | | | | | | | | | | All enumerable methods must go through the `each` so it retain old hash behavior. Revert this after Rails 6.1 in order to speed up enumerable methods. | ||||
| * | Fix spec as generate_message is no longer called during validation | lulalala | 2019-03-31 | 2 | -0/+17 |
| | | |||||
| * | Use errors#import instead of manipulating errors/details hash | lulalala | 2019-03-31 | 1 | -13/+8 |
| | | |||||
| * | Add convenience method group_by_attribute | lulalala | 2019-03-31 | 2 | -20/+17 |
| | | | | | | | | | | | | Many operations need grouping of errors by attributes, e.g. ActiveRecord::AutosaveAssociation#association_valid? Refactor other methods using group_by_attribute | ||||
| * | Change errors | lulalala | 2019-03-31 | 4 | -159/+363 |
| | | | | | | | | | | | | | | | | | | | | | | | | Allow `each` to behave in new way if block arity is 1 Ensure dumped marshal from Rails 5 can be loaded Make errors compatible with marshal and YAML dumps from previous versions of Rails Add deprecation warnings Ensure each behave like the past, sorted by attribute | ||||
| * | Add ActiveModel::Error and NestedError | lulalala | 2019-03-31 | 5 | -16/+321 |
| | | | | | | | | | | | | | | Add initialize_dup to deep dup. Move proc eval and flexible message position out to Errors, because proc eval is needed for Errors#added? and Errors#delete | ||||
| * | Fix misalignment caused by SHA eebb9ddf9ba559a510975c486fe59a4edc9da97d | lulalala | 2019-03-31 | 2 | -7/+7 |
| | | |||||
* | | Start Rails 6.1 development | Rafael Mendonça França | 2019-04-24 | 35 | -3197/+101 |
| | | |||||
* | | Merge pull request #35869 from ↵ | Ryuta Kamizono | 2019-04-25 | 5 | -4/+81 |
|\ \ | | | | | | | | | | | | | | | | abhaynikam/35866-add-touch-option-for-has-one-association Adds missing touch option to has_one association | ||||
| * | | Adds touch option to has_one association | Abhay Nikam | 2019-04-25 | 5 | -4/+81 |
| | | | |||||
* | | | Fix markup in CHANGELOGs [ci skip] | Ryuta Kamizono | 2019-04-25 | 2 | -3/+5 |
| | | | | | | | | | | | | Need to new line to break line in the markdown. | ||||
* | | | Merge pull request #36079 from sharang-d/update-changelog | George Claghorn | 2019-04-24 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update changelog for a bug-fix to read better [ci skip] | ||||
| * | | | Update changelog for a bug-fix to read better [ci skip] | Sharang Dashputre | 2019-04-24 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #36072 from itsWill/dont_fail_on_unsuported_images | George Claghorn | 2019-04-24 | 3 | -4/+24 |
|\ \ \ | | | | | | | | | Don't fail ImageAnalyzer on unsupported types |