aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #28839 from y-yagi/fix-yarn-exit-statusRafael França2017-04-251-2/+3
|\ | | | | Ensure bin/yarn matches the one generated by webpacker
| * Ensure bin/yarn matches the one generated by webpackeryuuji.yaginuma2017-04-231-2/+3
| | | | | | | | | | | | Import from https://github.com/rails/webpacker/pull/277. Fixes https://github.com/rails/webpacker/issues/278
* | Describe the changes in transactional testsMatthew Draper2017-04-251-0/+31
| |
* | Merge pull request #28828 from kamipo/fix_extending_modules_on_associationRafael França2017-04-253-10/+25
|\ \ | | | | | | Mixin `CollectionProxy::DelegateExtending` after `ClassSpecificRelation`
| * | Mixin `CollectionProxy::DelegateExtending` after `ClassSpecificRelation`Ryuta Kamizono2017-04-223-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ClassSpecificRelation` has `method_missing` and the `method_missing` is called first. if an associated class has the missing method in a relation, never reach to the `method_missing` in the `CollectionProxy`. I extracted `DelegateExtending` and included it to the delegate class that including `ClassSpecificRelation` to fix the issue. Fixes https://github.com/rails/rails/pull/28246#issuecomment-296033784.
* | | Merge pull request #28831 from kamipo/respond_to_missing_should_be_privateRafael França2017-04-2510-46/+40
|\ \ \ | | | | | | | | `respond_to_missing?` should be private
| * | | `respond_to_missing?` should be privateRyuta Kamizono2017-04-2210-46/+40
| |/ / | | | | | | | | | | | | | | | | | | Follow up of 03d3f036. Some of `respond_to?` were replaced to `respond_to_missing?` in 03d3f036. But the visibility is still public. It should be private.
* | | Merge pull request #28880 from bogdanvlviv/fix-migrator-testRafael França2017-04-251-1/+1
|\ \ \ | | | | | | | | Fix MigratorTest#test_migrator_verbosity
| * | | Fix MigratorTest#test_migrator_verbositybogdanvlviv2017-04-261-1/+1
|/ / / | | | | | | | | | | | | | | | | | | Add `ActiveRecord::Migration.verbose = true` to be sure that verbose is turned on in the test. Related to #28865
* | | Merge pull request #28840 from rails/sane-sdocRafael França2017-04-252-5/+5
|\ \ \ | | | | | | | | Ask for a sane version of SDoc
| * | | Ask for a sane version of SDocZachary Scott2017-04-232-5/+5
| | |/ | |/| | | | | | | | | | This will allow me to push a release, including bug fixes, without having to update Rails everytime.
* | | Merge pull request #28853 from kamipo/replace_regexp_zRafael França2017-04-255-20/+20
|\ \ \ | | | | | | | | Replace \Z to \z
| * | | Replace \Z to \zRyuta Kamizono2017-04-245-20/+20
| | | | | | | | | | | | | | | | \Z was a mistake of \z. Replace \Z to \z to prevent newly \Z added.
* | | | Merge pull request #28872 from eugeneius/enumerator_sizeRafael França2017-04-253-22/+14
|\ \ \ \ | | | | | | | | | | Remove checks for Enumerator#size method
| * | | | Remove checks for Enumerator#size methodEugene Kenny2017-04-253-22/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Enumerator#size method was introduced in Ruby 2.0. These tests were added when Rails 4.1 was current, and Ruby 1.9.3 was still supported. Since Rails 5 only Ruby >= 2.2.2 is supported, so the checks are no longer necessary.
* | | | | Merge pull request #28873 from aviav/typosVipul A M2017-04-251-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Fix typos [ci skip]
| * | | | Fix typos [ci skip]Tobias Fankhänel2017-04-251-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'lookup' is the noun. 'to look up' is the verb. Looked it up just to be sure. cf. https://en.wiktionary.org/wiki/lookup https://en.wiktionary.org/wiki/look_up
* | | | Add missing `action_view` section of config flagJon Moss2017-04-241-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #28861 from koic/unify_names_of_githubVipul A M2017-04-251-1/+1
|\ \ \ \ | | | | | | | | | | Unify the name of GitHub [ci skip]
| * | | | Unify the name of GitHub [ci skip]Koichi ITO2017-04-251-1/+1
| |/ / /
* | | | Merge pull request #28860 from ↵Vipul A M2017-04-251-0/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | y-yagi/add_form_with_generates_remote_forms_to_configuring_guide Add `form_with_generates_remote_forms` to configuring guide [ci skip]
| * | | Add `form_with_generates_remote_forms` to configuring guide [ci skip]yuuji.yaginuma2017-04-251-0/+2
| |/ /
* | | Fix regexp in the doc [ci skip]Ryuta Kamizono2017-04-241-1/+1
| | | | | | | | | | | | Follow up of #17148.
* | | secrets.yml --> config/secrets.ymlJon Moss2017-04-231-1/+1
| | | | | | | | | | | | [ci skip]
* | | Add Action View info to 5.1 release notesJon Moss2017-04-231-0/+23
| | | | | | | | | | | | [ci skip]
* | | Use parameters, not paramsJon Moss2017-04-231-2/+2
| | | | | | | | | | | | | | | | | | Reads better to use the full word. [ci skip]
* | | Small grammar fixesJon Moss2017-04-231-7/+6
| | | | | | | | | | | | [ci skip]
* | | Remove unused headingJon Moss2017-04-231-2/+0
| | | | | | | | | | | | [ci skip]
* | | Add more Railties notable changesJon Moss2017-04-231-0/+8
| | | | | | | | | | | | [ci skip]
* | | Add Railties info to 5.1 release notesJon Moss2017-04-231-0/+36
| | | | | | | | | | | | [ci skip]
* | | Add Active Model info to 5.1 release notesJon Moss2017-04-231-1/+12
| | | | | | | | | | | | [ci skip]
* | | Remove unused headingsJon Moss2017-04-231-4/+0
| | | | | | | | | | | | [ci skip]
* | | Finish Action Cable section in release notesJon Moss2017-04-231-0/+6
| | | | | | | | | | | | [ci skip]
* | | Finish Action Mailer section in release notesJon Moss2017-04-231-4/+4
| | | | | | | | | | | | [ci skip]
* | | Add Active Job info to 5.1 release notesJon Moss2017-04-231-1/+12
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #28841 from pendletons/upgrade-doc-typoJon Moss2017-04-231-1/+1
|\ \ \ | |/ / |/| | [ci_skip] Fix typo in Rails 5.1 upgrade notes
| * | [ci_skip] Fix typo in Rails 5.1 upgrade notesShanthi Pendleton2017-04-231-1/+1
|/ /
* | Merge pull request #28829 from y-yagi/follow_up_128b804Rafael França2017-04-222-2/+32
|\ \ | |/ |/| Set to `form_with_generates_remote_forms` only when config is explicitly specified
| * Set to `form_with_generates_remote_forms` only when config is explicitly ↵yuuji.yaginuma2017-04-222-2/+32
|/ | | | | | | | | specified Without this check, even if config is not specified, `ActionView::Helpers::FormHelper.form_with_generates_remote_forms` always be set to nil and remote form not be generated. Follow up to 128b804c6ce40fcbde744f294f8cb98654f6efec
* Add note about #26929 in the upgrade guideRafael Mendonça França2017-04-211-0/+17
| | | | | This is a small breaking change that we chose to make in 5.1 since the fix can be done with a search and replace tool.
* Configure form_with_generates_remote_forms in its own initializerRafael Mendonça França2017-04-213-0/+61
| | | | | | | | | This configuration is not present in ActionView::Base so we can't let the action_view.set_configs initializer set it. Also add tests to make sure this config works. Fixes #28824
* Add test case to make sure we can implicit convert a Parameters to a HashRafael Mendonça França2017-04-201-0/+7
|
* Merge pull request #28432 from marksiemers/masterRafael França2017-04-201-1/+1
|\ | | | | Update 'Building Complex Forms' with `inverse_of`
| * Update 'Building Complex Forms' with `inverse_of`marksiemers2017-03-151-1/+1
| | | | | | If the example for complex forms is implemented, ActiveRecord will prevent saving unless `inverse_of: :person` is added to the `has_many :addresses` association.
* | Merge pull request #28818 from y-yagi/add_requireRafael França2017-04-201-0/+1
|\ \ | | | | | | Add missing require
| * | Add missing requireyuuji.yaginuma2017-04-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, unit test fails. ``` bundle exec ruby -w -Ilib:lib:test test/cases/logging_test.rb Using inline Run options: --seed 41246 # Running: SE......S.... Finished in 0.052938s, 245.5696 runs/s, 831.1585 assertions/s. 1) Error: LoggingTest#test_job_error_logging: NameError: uninitialized constant LoggingTest::RescueJob test/cases/logging_test.rb:130:in `rescue in test_job_error_logging' test/cases/logging_test.rb:129:in `test_job_error_logging' 13 runs, 44 assertions, 0 failures, 1 errors, 2 skips You have skipped tests. Run with --verbose for details. ```
* | | Merge pull request #28596 from betesh/fix-double-habtm-insertRafael Mendonça França2017-04-203-0/+32
|\ \ \ | | | | | | | | | | | | Fix #24032
| * | | Don't attempt to create a new record that was already created.Isaac Betesh2017-04-203-0/+32
|/ / / | | | | | | | | | Fixes #24032
* | | Merge pull request #28640 from kamipo/prevent_double_firing_before_save_callbackRafael França2017-04-205-54/+70
|\ \ \ | |/ / |/| | Prevent double firing the before save callback of new object when the parent association saved in the callback
| * | Prevent double firing the before save callback of new object when the parent ↵Ryuta Kamizono2017-04-215-54/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association saved in the callback Related #18155, #26661, 268a5bb, #27434, #27442, and #28599. Originally #18155 was introduced for preventing double insertion caused by the after save callback. But it was caused the before save issue (#26661). 268a5bb fixed #26661, but it was caused the performance regression (#27434). #27442 added new record to `target` before calling callbacks for fixing #27434. But it was caused double firing before save callback (#28599). We cannot add new object to `target` before saving the object. This is improving #18155 to only track callbacks after `save`. Fixes #28599.