aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #36130 from alexcameron89/add_action_view_rnप्रथमेश Sonpatki2019-04-301-0/+53
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Add 6.0 Release Notes for Action View
| * | | | | | | [ci skip] Add 6.0 Release Notes for Action ViewAlex Kitchens2019-04-291-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've added release notes based off of the CHANGELOG for Action View.
* | | | | | | | Merge pull request #36136 from robinjfisher/patch-1Ryuta Kamizono2019-04-301-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix incorrect url in guide [ci skip]
| * | | | | | | | Fix incorrect url in guide [ci skip]Robin Fisher2019-04-291-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | The example functional test lists the 'create' route as article_url rather than articles_url
* | | | | | | | Extract `_raise_record_not_touched_error`Ryuta Kamizono2019-04-292-16/+13
| | | | | | | |
* | | | | | | | Merge pull request #36129 from okuramasafumi/improve-error-message-of-delegateRyuta Kamizono2019-04-291-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Improve error message of ActiveSupport delegate
| * | | | | | | Improve error message of ActiveSupport delegateokuramasafumi2019-04-291-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport `delegate` has `to` option, but it's not a option hash anymore and now it's a keyword argument. When `to` argument is not given, it raises an ArgumentError but the message suggests supplying "options hash", which is now wrong. Now it's fixed to provide correct suggestion to supply a keyword argument.
* | | | | | | fixes typo in guide [ci skip]Xavier Noria2019-04-281-1/+1
| | | | | | |
* | | | | | | new config to opt-out from adding app directories to $LOAD_PATHXavier Noria2019-04-284-6/+40
| | | | | | |
* | | | | | | Merge pull request #36121 from alecclarke/update-model-generator-output-in-guideप्रथमेश Sonpatki2019-04-271-4/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Update the guide's model generator output.
| * | | | | | | [ci skip] Update the guide's model generator output.Alec Clarke2019-04-271-4/+7
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The model generator code sample used in the command line guides was displaying an outdated output for the generator's usage. This change updates the sample to mirror what's currently output when running `$rails generate model`.
* | | | | | | Merge pull request #36120 from kamipo/should_maintain_join_typeRyuta Kamizono2019-04-276-17/+29
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Fix merging left_joins to maintain its own `join_type` context
| * | | | | | Fix merging left_joins to maintain its own `join_type` contextRyuta Kamizono2019-04-276-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 Mansur2019-04-261-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 Thomas2019-04-263-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प्रथमेश Sonpatki2019-04-261-0/+68
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add 6.0 Release Notes for Action Pack
| * | | | | | | [ci skip] Add 6.0 Release Notes for Action PackAlex Kitchens2019-04-261-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 downloadsGeorge Claghorn2019-04-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See 19770d6.
* | | | | | | | Merge pull request #36104 from prathamesh-sonpatki/bump-bootsnapKasper Timm Hansen2019-04-263-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.5Prathamesh Sonpatki2019-04-263-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Refs https://github.com/Shopify/bootsnap/pull/257
* | | | | | | | Merge pull request #36098 from michaelrbock/patch-1Rafael França2019-04-251-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fixes grammar in comments on tag_name and tag_id
| * | | | | | | Fixes grammar in comments on tag_name and tag_idMichael Bock2019-04-251-2/+2
| |/ / / / / /
* | | | | | | [ci skip] Get npm just the way they like itKasper Timm Hansen2019-04-251-1/+1
| | | | | | |
* | | | | | | [ci skip] Remove à la just like that.Kasper Timm Hansen2019-04-251-1/+2
| | | | | | |
* | | | | | | [ci skip] Documentation pass of upgrading guide.Kasper Timm Hansen2019-04-251-14/+14
|/ / / / / /
* | | | | | Update bug report templatesRyuta Kamizono2019-04-255-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Bump gem version to 6.0.0.rc1.
* | | | | | Merge pull request #36090 from prathamesh-sonpatki/fix-yarn-lockRyuta Kamizono2019-04-251-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix outdated yarn.lock
| * | | | | | Fix outdated yarn.lockPrathamesh Sonpatki2019-04-251-0/+7
|/ / / / / /
* | | | | | Change the deprecation for Enumerating ActiveModel::Errors to Rails 6.1 ↵Abhay Nikam2019-04-251-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 Kamizono2019-04-251-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 Nikam2019-04-251-2/+25
|/ / / / / /
* | | | | | Merge pull request #32313 from lulalala/model_error_as_objectRafael França2019-04-2422-230/+956
|\ \ \ \ \ \ | | | | | | | | | | | | | | Model error as object
| * | | | | | Spec for display original raw type in detailslulalala2019-03-311-0/+18
| | | | | | |
| * | | | | | Set default array to detailslulalala2019-03-312-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | maintaining behavior errors.details[:foo].any?
| * | | | | | Fix messages[]= does not override valuelulalala2019-03-312-0/+9
| | | | | | |
| * | | | | | Freeze DeprecationHandling array and hashlulalala2019-03-311-13/+20
| | | | | | |
| * | | | | | Fix equality comparison raising error buglulalala2019-03-312-1/+8
| | | | | | |
| * | | | | | Fix speclulalala2019-03-311-1/+1
| | | | | | |
| * | | | | | Assert deprecationlulalala2019-03-312-8/+8
| | | | | | |
| * | | | | | Split messages and to_hashlulalala2019-03-311-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'`lulalala2019-03-3113-50/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert some tests to ensure back compatibility
| * | | | | | Add deprecation to slice!lulalala2019-03-312-5/+5
| | | | | | |
| * | | | | | Nested attribute error's attribute name to use different key:lulalala2019-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To keep the same as SHA dcafe995bfe51e53dd04607956be9b54073e9cb6
| * | | | | | String override options in #import to convert to symbollulalala2019-03-311-0/+5
| | | | | | |
| * | | | | | Allow errors to remove duplicates, and ensure cyclic associations w/ ↵lulalala2019-03-314-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autosave duplicate errors can be removed See SHA 7550f0a016ee6647aaa76c0c0ae30bebc3867288
| * | | | | | Add messages_forlulalala2019-03-311-1/+7
| | | | | | |
| * | | | | | Add a transitional method `objects`, for accessing the array directly.lulalala2019-03-312-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.lulalala2019-03-311-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 validationlulalala2019-03-312-0/+17
| | | | | | |
| * | | | | | Use errors#import instead of manipulating errors/details hashlulalala2019-03-311-13/+8
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 04:28:27 +0000