aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #36153 from yahonda/use_schema_to_ignoreRyuta Kamizono2019-05-013-19/+7
|\
| * Remove database specific sql statements from SQLCounterYasuo Honda2019-05-013-19/+7
|/
* `@controller` may not be defined here, and if so, it causes a Ruby warningAkira Matsuda2019-05-011-1/+1
* Merge pull request #36150 from rails/error-any-delegationAaron Patterson2019-04-302-1/+12
|\
| * any? should be delegated to the errors listAaron Patterson2019-04-302-1/+12
* | Merge pull request #36148 from ksolo/update-event-duration-in-notificationsEileen M. Uchitelle2019-04-302-6/+5
|\ \ | |/ |/|
| * revert changes to monotonic timesKevin Solorio2019-04-302-6/+5
|/
* Merge pull request #36146 from carlesjove/remove_outdated_gem_from_guidesRyuta Kamizono2019-05-011-21/+0
|\
| * Remove dynamic_form gem references in guidesCarles Jove i Buxeda2019-04-301-21/+0
|/
* Merge pull request #36142 from kamipo/should_take_first_record_stateRyuta Kamizono2019-04-302-8/+11
|\
| * Should take the record's state of first action in the transactionRyuta Kamizono2019-04-302-8/+11
* | Merge pull request #36137 from prathamesh-sonpatki/action-mailer-release-notesAlex Kitchens2019-04-301-0/+33
|\ \ | |/ |/|
| * Action Mailer release notes [ci skip]Prathamesh Sonpatki2019-04-301-0/+33
* | Fix rubocop offencesRyuta Kamizono2019-04-302-3/+3
|/
* Merge pull request #36130 from alexcameron89/add_action_view_rnप्रथमेश Sonpatki2019-04-301-0/+53
|\
| * [ci skip] Add 6.0 Release Notes for Action ViewAlex Kitchens2019-04-291-0/+53
* | Merge pull request #36136 from robinjfisher/patch-1Ryuta Kamizono2019-04-301-1/+1
|\ \
| * | Fix incorrect url in guide [ci skip]Robin Fisher2019-04-291-1/+1
|/ /
* | 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 delegateokuramasafumi2019-04-291-1/+1
|/
* 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.Alec Clarke2019-04-271-4/+7
|/
* 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` contextRyuta Kamizono2019-04-276-17/+29
* | Fallback to spawn instead of fork in jruby (#36111)Guilherme Mansur2019-04-261-8/+12
* | Frozen truncate (#36109)Jordan Thomas2019-04-263-1/+25
* | Merge pull request #36107 from alexcameron89/add_more_release_notesप्रथमेश Sonpatki2019-04-261-0/+68
|\ \
| * | [ci skip] Add 6.0 Release Notes for Action PackAlex Kitchens2019-04-261-0/+68
* | | Halve string allocations in S3 streaming and partial downloadsGeorge Claghorn2019-04-261-2/+2
* | | 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.5Prathamesh Sonpatki2019-04-263-9/+9
* | | Merge pull request #36098 from michaelrbock/patch-1Rafael França2019-04-251-2/+2
|\ \ \ | |_|/ |/| |
| * | 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
* Merge pull request #36090 from prathamesh-sonpatki/fix-yarn-lockRyuta Kamizono2019-04-251-0/+7
|\
| * Fix outdated yarn.lockPrathamesh Sonpatki2019-04-251-0/+7
|/
* Change the deprecation for Enumerating ActiveModel::Errors to Rails 6.1 inste...Abhay Nikam2019-04-251-5/+5
* Merge pull request #36086 from abhaynikam/35869-add-documentation-for-has-one...Ryuta Kamizono2019-04-251-2/+25
|\
| * 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
|\
| * Spec for display original raw type in detailslulalala2019-03-311-0/+18
| * Set default array to detailslulalala2019-03-312-1/+15
| * Fix messages[]= does not override valuelulalala2019-03-312-0/+9
| * Freeze DeprecationHandling array and hashlulalala2019-03-311-13/+20