aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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 correct value
| * | Add separate test to ensure that `delegate` with `:private` option returns ↵bogdanvlviv2018-02-283-16/+23
|/ / | | | | | | | | | | | | | | correct value Remove extra comments `# Asking for private method` in activesupport/test/core_ext/module_test.rb Improve docs of using `delegate` with `:private` Update changelog of #31944
* | Merge pull request #32137 from okkez/patch-1Andrew White2018-02-281-1/+1
|\ \ | | | | | | Fix a typo in activerecord/CHANGELOG.md
| * | Fix a typo in activerecord/CHANGELOG.mdokkez2018-02-281-1/+1
|/ / | | | | | | columsn -> columns
* | Merge pull request #31926 from composerinteralia/am-attributesRafael França2018-02-282-0/+24
|\ \ | | | | | | Add ActiveModel::Attributes#attributes
| * | Add ActiveModel::Attributes#attributesDaniel Colson2018-02-072-0/+24
| | | | | | | | | | | | | | | | | | This starts to fix #31832. ActiveModel::Attributes includes ActiveModel::AttributeMethods, which requires an `#attributes` method that returns a hash with string keys.
* | | 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 field
| * | | 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`
| * | | Fix `new_framework_defaults_6_0.rb`bogdanvlviv2018-02-272-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | `default_enforce_utf8` belongs to `config.action_view` Update info about `:skip_enforcing_utf8` since we can change default behavior via `config.action_controller.default_enforce_utf8` Related to #32125
* | | Merge pull request #31171 from sambostock/improve-abstract-class-documentationRyuta Kamizono2018-02-281-10/+36
|\ \ \ | | | | | | | | | | | | | | | | Expand AR::Base.abstract_class documentation [ci skip]
| * | | Expand AR::Base.abstract_class documentationSam Bostock2018-02-201-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous documentation is somewhat unclear about the use case for an abstract ActiveRecord class. This clears it up by highlighting the following points: - table_name is not derived from the abstract class' name - type is not derived on direct descendants of the abstract class - validations, not abstract_class, should be used to specify whether the parent model can be instantiated or not
* | | | 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`
| * | | Use `with_partial_writes` helper in `activerecord/test/cases/dirty_test.rb`bogdanvlviv2018-02-281-5/+1
|/ / / | | | | | | | | | Related to 948b931925febac3c965ab13470065ced68f7b53
* | | Merge pull request #32127 from zamith/zamith/screenshot-absolute-pathRafael França2018-02-272-6/+6
|\ \ \ | | | | | | | | Uses the absolute path for system test screenshots
| * | | Uses the absolute path for system test screenshotsZamith2018-02-272-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Why: * When getting an error that generates a screenshot it would be helpful to be able to ctrl+click it to quickly open it in the browser, which does not work with relative paths This change addresses the need by: * Changing `image_path` to disregard the relative path and use the absolute one instead
* | | | Merge pull request #32121 from benoittgt/move-rails-routes-to-rails-commandRafael França2018-02-275-143/+170
|\ \ \ \ | | | | | | | | | | Move rake routes task to rails command
| * | | | Move rake routes task to rails commandBenoit Tigeot2018-02-275-143/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a discussion with matthewd. It was mentioned that rake tasks need to be moved to rails command. See: https://github.com/rails/rails/issues/32117
* | | | | Merge pull request #32125 from rails/switch-to-not-enforcing-utf8-by-defaultAndrew White2018-02-2714-42/+202
|\ \ \ \ \ | | | | | | | | | | | | Don't enforce UTF-8 by default
| * | | | | Don't enforce UTF-8 by defaultAndrew White2018-02-2714-42/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the disabling of TLS 1.0 by most major websites, continuing to run IE8 or lower becomes increasingly difficult so default to not enforcing UTF-8 encoding as it's not relevant to other browsers.
* | | | | | Merge pull request #31966 from kg8m/fix_limited_ids_forRyuta Kamizono2018-02-286-17/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use column alias of primary_key in limited_ids_for
| * | | | | | Fix `#columsn_for_distinct` of MySQL and PostgreSQLkg8m2018-02-276-17/+30
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent `ActiveRecord::FinderMethods#limited_ids_for` from using correct primary key values even if `ORDER BY` columns include other table's primary key. Fixes #28364.
* | | | | | Merge pull request #28270 from mmangino/dont_ignore_seralization_optionsRyuta Kamizono2018-02-273-1/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | Don't accidentally lose includes in serialization
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Active Record distinct & order #count regression
| * | | | | | Distinct with order #count regressionMax Schwenk2018-02-252-1/+9
| | | | | | |
* | | | | | | Merge pull request #32126 from ↵Rafael França2018-02-271-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | marceloperini/marceloperini/add-nodoc-to-ActionView__Helpers__FormBuilder#emitted_hidden_id Add :nodoc: to ActionView::Helpers::FormBuilder#emitted_hidden_id?
| * | | | | | | add :nodoc: to ActionView::Helpers::FormBuilder#emitted_hidden_id?Marcelo Perini Veloso2018-02-271-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #31189 from ↵Rafael França2018-02-272-2/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | tgxworld/raise_error_when_advisory_lock_is_not_releases Raise an error if advisory lock in migrator was not released.
| * | | | | | | 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 doc
| * | | | | | | [ci skip]Change requring order of files in docwillnet2018-02-271-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | This change was made at 4a835aa3236eedb135ccf8b59ed3c03e040b8b01
* | | | | | | Merge pull request #26799 from deraru/support-i18n-key-in-submit-tagRafael França2018-02-264-3/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Support i18n key at translation of value in submit tag
| * | | | | | | Change translation key of submit_tag from module_name_class_name to ↵Rui Onodera2018-02-274-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | module_name/class_name Currently submit_tag value translation does not support i18n key style locale key. It confuses me a bit because many other components support i18n key style locale key. I added i18n key style locale key support to submit tag.
* | | | | | | | 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 sect…
| * | | | | | | Correct `to` option's value of the route in the Bound Parameters section in ↵Avneet Singh Malhotra2018-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | routing guide.
* | | | | | | | Merge pull request #32122 from bogdanvlviv/remove-extra-changelog-added-by-31944Rafael França2018-02-261-16/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove extra changelog added by #31944
| * | | | | | | | Remove extra changelog added by #31944bogdanvlviv2018-02-271-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was removed by #32106 since it was backported to `5-2-stable`. [ci skip]
* | | | | | | | | Clear Blob's type before sending itGeorge Claghorn2018-02-262-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Prevent older versions of Chrome from appending a Content-Type header containing the Blob type, rendering the request invalid if we intend not to provide a Content-Type. This behavior was observed in Chrome 58.
* | | | | | | | Merge pull request #31944 from equivalent/delegate_privateKasper Timm Hansen2018-02-263-2/+117
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | delegate to, with private: true option
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually `reflection.klass` should be valid AR model unless `polymorphic?`. Previously it worked limitedly by ignoring `NameError` even if `reflection.klass` is invalid, and our isolated testing depends on the limited working. Probably we should also check the klass validity in `check_validity!` properly. Until that time, I restored the error suppression for now. Closes #32113.
* | | | | | | Ensure we don't write virtual attributes on update, tooSean Griffin2018-02-263-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See 948b931925febac3c965ab13470065ced68f7b53 for context
* | | | | | | Never attempt to write virtual attributes to the databaseSean Griffin2018-02-262-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the place where we limit what gets sent to the database is in the implementation for `partial_writes`. We should also be restricting it to column names when partial writes are turned off. Note that we're using `&` instead of just defaulting to `self.class.column_names`, as the instance version of `attribute_names` does not include attributes which are uninitialized (were not included in the select clause)
* | | | | | | Avoid specifying content types for direct uploads to Google Cloud StorageGeorge Claghorn2018-02-262-6/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | Fix customizing the download Content-Type for a directly-uploaded blob via a signed URL. See e8286ee.
* | / / / / Fix "NameError: uninitialized constant Categorization::Category"yuuji.yaginuma2018-02-261-0/+1
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #31895, build of 2.5 and AR combination failed. https://travis-ci.org/rails/rails/jobs/346064349#L1638 It seems to be the reason that model is not loading properly, so I added require. But I'm not sure if this is correct
* | | | | Merge pull request #32106 from bogdanvlviv/fix-rails-6_0_changelogsRyuta Kamizono2018-02-263-36/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove changelogs for Rails 6.0 since they were backported to `5-2-stable` [ci skip]
| * | | | | Remove changelogs for Rails 6.0 since they were backported to `5-2-stable`bogdanvlviv2018-02-263-36/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove railties' changelog added by 7340596de45dc4c0f62a287b6acc4e71d8ee6c60 since it was backported to `5-2-stable` via ac99916fcf7bf27bb1519d4f7387c6b4c5f0463d Remove activesupport's changelog added by 1077ae96b34b5a1dfbf10ee0c40b1ceb1eb6b30b since it was backported to `5-2-stable` via a2b97e4ffef971607a1be8fc7909f099b6840f36 Remove activesupport's changelog added by 0d41a76d0c693000005d79456dee7f9299f5e8d4 since it was backported to `5-2-stable` via cdce6a709e1cbc98fff009effc3b1b3ce4c7e8db Remove activestorage's changelog added by d57c52a385eb57c6ce8c6d124ab5e186f931d142 since it was backported to `5-2-stable` via 5292cdf59a2052c453d6016c69b90b790cbf2547 Follow up c113bdc9d0c2cffd535ca97aff85c4bdc46b11f6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 16:11:05 +0000