aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #28885 from kamipo/remove_useless_test_caseRafael França2017-04-262-13/+0
|\ | | | | Remove useless test case
| * Remove useless test caseRyuta Kamizono2017-04-262-13/+0
| | | | | | | | | | Cannot call private methods in `@klass` against `CollectionProxy` (inherites `Relation`) because using `public_send` in `method_missing`.
* | Merge pull request #28847 from Edouard-chin/current-page-checkquery-stringRafael França2017-04-262-1/+19
|\ \ | | | | | | Fix `current_page?` regression:
| * | Fix `current_page?` regression:Edouard CHIN2017-04-262-1/+19
| | | | | | | | | | | | | | | | | | - `check_parameters` kwargs was added to the `current_page?` method, the implementation was assuming only hashes responds to `delete`. This was causing issues when `current_page?` was called with a Active Model object - ref https://github.com/rails/rails/pull/27549 - Fixes #28846
* | | Merge pull request #28891 from sodabrew/patch-1Rafael França2017-04-261-2/+0
|\ \ \ | | | | | | | | Remove mysql2 database adapter default username root
| * | | Remove mysql2 database adapter default username rootAaron Stone2017-04-261-2/+0
| | | |
* | | | Pluralize methodsJon Moss2017-04-261-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | More release notes for Rails 5.1 [ci skip]claudiob2017-04-261-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | @dhh most changes that I mentioned in the talk were already there: https://speakerdeck.com/claudiob/rails-5-dot-1-upcoming-features I just added a few that were missing.
* | | | Merge pull request #28894 from robin850/5-1-notes-fixesClaudio B2017-04-261-28/+86
|\ \ \ \ | | | | | | | | | | Some improvements to the 5.1 release notes
| * | | | Add some items to the release notes [ci skip]Robin Dupret2017-04-271-0/+54
| | | | |
| * | | | Some improvements in the 5.1 release notes [ci skip]Robin Dupret2017-04-271-28/+32
|/ / / /
* / / / Revert "Merge pull request #27636 from ↵Rafael Mendonça França2017-04-2625-185/+98
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | mtsmfm/disable-referential-integrity-without-superuser-privilege-take-2" This reverts commit c1faca6333abe4b938b98fedc8d1f47b88209ecf, reversing changes made to 8c658a0ecc7f2b5fc015d424baf9edf6f3eb2b0b. See https://github.com/rails/rails/pull/27636#issuecomment-297534129
* | | Lock connection before checking it inMatthew Draper2017-04-261-6/+8
| | |
* | | s/broadcasing/broadcasting/Akira Matsuda2017-04-271-1/+1
| |/ |/| | | | | [ci skip]
* | 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