aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Handle file checksumming errorsGeorge Claghorn2018-02-281-0/+6
* | Remove CHANGELOG entries which were backported to 5-2-stableRyuta Kamizono2018-02-284-28/+3
* | Alias `assign_attributes` to `attributes=` for `AttributeAssignment`Ryuta Kamizono2018-02-283-5/+10
* | Don't include unused `ActiveSupport::Concern`Ryuta Kamizono2018-02-281-1/+0
* | Merge pull request #32133 from bogdanvlviv/delegate-with-privateRyuta Kamizono2018-02-283-16/+23
|\ \
| * | Add separate test to ensure that `delegate` with `:private` option returns co...bogdanvlviv2018-02-283-16/+23
|/ /
* | Merge pull request #32137 from okkez/patch-1Andrew White2018-02-281-1/+1
|\ \
| * | Fix a typo in activerecord/CHANGELOG.mdokkez2018-02-281-1/+1
|/ /
* | Merge pull request #31926 from composerinteralia/am-attributesRafael França2018-02-282-0/+24
|\ \
| * | Add ActiveModel::Attributes#attributesDaniel Colson2018-02-072-0/+24
* | | Merge pull request #32087 from prikha/add-better-select-tag-option-handlingRafael França2018-02-273-1/+36
|\ \ \
| * | | Let select render default selected option for required fieldSerj Prikhodko2018-02-273-1/+36
| | |/ | |/|
* | | Merge pull request #32131 from bogdanvlviv/fix-new_framework_defaults_6_0Rafael França2018-02-272-3/+3
|\ \ \
| * | | Fix `new_framework_defaults_6_0.rb`bogdanvlviv2018-02-272-3/+3
| |/ /
* | | Merge pull request #31171 from sambostock/improve-abstract-class-documentationRyuta Kamizono2018-02-281-10/+36
|\ \ \
| * | | Expand AR::Base.abstract_class documentationSam Bostock2018-02-201-10/+36
* | | | Merge pull request #32134 from bogdanvlviv/use-with_partial_writesRyuta Kamizono2018-02-281-5/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Use `with_partial_writes` helper in `activerecord/test/cases/dirty_test.rb`bogdanvlviv2018-02-281-5/+1
|/ / /
* | | Merge pull request #32127 from zamith/zamith/screenshot-absolute-pathRafael França2018-02-272-6/+6
|\ \ \
| * | | Uses the absolute path for system test screenshotsZamith2018-02-272-6/+6
* | | | Merge pull request #32121 from benoittgt/move-rails-routes-to-rails-commandRafael França2018-02-275-143/+170
|\ \ \ \
| * | | | Move rake routes task to rails commandBenoit Tigeot2018-02-275-143/+170
* | | | | Merge pull request #32125 from rails/switch-to-not-enforcing-utf8-by-defaultAndrew White2018-02-2714-42/+202
|\ \ \ \ \
| * | | | | Don't enforce UTF-8 by defaultAndrew White2018-02-2714-42/+202
* | | | | | Merge pull request #31966 from kg8m/fix_limited_ids_forRyuta Kamizono2018-02-286-17/+30
|\ \ \ \ \ \
| * | | | | | Fix `#columsn_for_distinct` of MySQL and PostgreSQLkg8m2018-02-276-17/+30
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #28270 from mmangino/dont_ignore_seralization_optionsRyuta Kamizono2018-02-273-1/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix styleMike Mangino2017-03-031-1/+1
| * | | | | Don't accidentally lose includes in serializationMike Mangino2017-03-033-4/+13
* | | | | | Merge pull request #32005 from maschwenk/ar-distinct-order-count-regressionRyuta Kamizono2018-02-273-1/+13
|\ \ \ \ \ \
| * | | | | | Distinct with order #count regressionMax Schwenk2018-02-252-1/+9
* | | | | | | Merge pull request #32126 from marceloperini/marceloperini/add-nodoc-to-Actio...Rafael França2018-02-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | add :nodoc: to ActionView::Helpers::FormBuilder#emitted_hidden_id?Marcelo Perini Veloso2018-02-271-1/+1
* | | | | | | | Merge pull request #31189 from tgxworld/raise_error_when_advisory_lock_is_not...Rafael França2018-02-272-2/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Raise an error if advisory lock in migrator was not released.Guo Xiang Tan2017-11-212-2/+27
* | | | | | | | Merge pull request #32124 from willnet/change-order-files-requiredYuji Yaginuma2018-02-271-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | [ci skip]Change requring order of files in docwillnet2018-02-271-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #26799 from deraru/support-i18n-key-in-submit-tagRafael França2018-02-264-3/+48
|\ \ \ \ \ \ \
| * | | | | | | Change translation key of submit_tag from module_name_class_name to module_na...Rui Onodera2018-02-274-3/+48
* | | | | | | | Merge pull request #32115 from avneetmalhotra/routing_bound_parameters_guide_fixRafael França2018-02-261-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Correct `to` option's value of the route in the Bound Parameters section in r...Avneet Singh Malhotra2018-02-261-1/+1
* | | | | | | | Merge pull request #32122 from bogdanvlviv/remove-extra-changelog-added-by-31944Rafael França2018-02-261-16/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove extra changelog added by #31944bogdanvlviv2018-02-271-16/+0
* | | | | | | | | Clear Blob's type before sending itGeorge Claghorn2018-02-262-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #31944 from equivalent/delegate_privateKasper Timm Hansen2018-02-263-2/+117
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | add private: true option for ActiveSupport delegateTomas Valent2018-02-263-2/+117
|/ / / / / / /
* | | | | | | Update test to reflect direct upload header changesGeorge Claghorn2018-02-261-1/+1
* | | | | | | Partly revert 91b30a001b79096b60d9424a4664a417dce0b767Ryuta Kamizono2018-02-271-1/+7
* | | | | | | Ensure we don't write virtual attributes on update, tooSean Griffin2018-02-263-2/+6
* | | | | | | Never attempt to write virtual attributes to the databaseSean Griffin2018-02-262-1/+22