aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | Rase when calling `lock!` in a dirty recordRafael Mendonça França2017-10-233-15/+20
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Remove deprecated support to passing a class to `:class_name` on associationsRafael Mendonça França2017-10-235-25/+10
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Remove deprecated argument `default` from `index_name_exists?`Rafael Mendonça França2017-10-234-16/+8
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Remove deprecated support to `quoted_id` when typecasting an Active Record ↵Rafael Mendonça França2017-10-235-71/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object
| * | | | | | | | | | | | | | | | | | Removed deprected evented redis adapterRafael Mendonça França2017-10-234-151/+5
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Remove deprecated `ActionController::ParamsParser::ParseError`Rafael Mendonça França2017-10-232-7/+6
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Remove deprecated Erubis ERB handlerRafael Mendonça França2017-10-237-117/+4
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #30955 from prathamesh-sonpatki/rm-changelog-entryRafael França2017-10-231-7/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Remove CHANGELOG entry for the change that was backported to 5-1-stable [ci skip]
| * | | | | | | | | | | | | | | | | Remove CHANGELOT entry for the change that was backported to 5-1-stable [ci ↵Prathamesh Sonpatki2017-10-231-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip] - It was backported in https://github.com/rails/rails/commit/0eae8dd4b859c109919e5da0d6e74ffc6dc8a258 and is present in Rails 5.1.3
* | | | | | | | | | | | | | | | | | Fix duplicate aliases when using both INNER/LEFT JOINsRyuta Kamizono2017-10-232-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should be shared the count of alias tracking in both INNER/LEFT JOINs to avoid duplicate aliases. Fixes #30504. Closes #30410.
* | | | | | | | | | | | | | | | | | Ensure associations doesn't table name collide with string joinsRyuta Kamizono2017-10-232-4/+11
| |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we have no test for alias tracking with string joins. I've add test case for that to catch a future regression.
* | | | | | | | | | | | | | | | | Use the indicative mood consistently [ci skip]George Claghorn2017-10-221-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Place `MocktailDesigner` in `test/models/drink_designer.rb`Ryuta Kamizono2017-10-233-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `MocktailDesigner` inherits `DrinkDesigner` and can not be used alone.
* | | | | | | | | | | | | | | | | Fix links [ci skip]George Claghorn2017-10-221-2/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Extract metadata from images and videosGeorge Claghorn2017-10-2225-37/+407
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #30949 from bogdanvlviv/add-30850-to-changelogEileen M. Uchitelle2017-10-221-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog entry about new `allow_other_host` option for `redirect_back` method
| * | | | | | | | | | | | | | | | | Add changelog entry about new `allow_other_host` option for `redirect_back` ↵bogdanvlviv2017-10-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | method [ci skip] Related to #30850
* | | | | | | | | | | | | | | | | | Merge pull request #30821 from GBH/active-storage-readmeEileen M. Uchitelle2017-10-221-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveStorage install note [skip ci]
| * | | | | | | | | | | | | | | | | | how do we install active_storage? [skip ci]Oleg2017-10-061-0/+4
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #29710 from padi/rails-ujs-docsGuillermo Iguaran2017-10-222-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds descriptions to rails-ujs methods [ci skip]
| * | | | | | | | | | | | | | | | | | | Adds descriptions to rails-ujs methods [ci skip]Marc Rendl Ignacio2017-07-072-0/+25
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Avoid slicing from Thor's original HWIAAkira Matsuda2017-10-221-2/+1
| |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because `options` here is not AS::HWIA but an instance of Thor::CoreExt::HWIA that looks very similar to ours but behaves slightly different, we need to keep this object be an instance of Thor::CoreExt::HWIA. Since Ruby 2.5 has Hash#slice that returns a new Hash instance now, we need to avoid calling `slice` on this tricky object.
* | | | | | | | | | | | | | | | | | | [Active Storage] require_relative => requireAkira Matsuda2017-10-211-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | [Action Cable] require_relative => requireAkira Matsuda2017-10-213-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This basically reverts f851e1f705f26d8f92f0fc1b265b20bc389d23cb
* | | | | | | | | | | | | | | | | | | [Active Job] require_relative => requireAkira Matsuda2017-10-214-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This basically reverts fef234f1f0a238c2277459652861144ae89501ff
* | | | | | | | | | | | | | | | | | | [Action Mailer] require_relative => requireAkira Matsuda2017-10-212-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This basically reverts cd9cc721ab54e2b0c7875cacf2113f03908a8bb7
* | | | | | | | | | | | | | | | | | | [Action View] require_relative => requireAkira Matsuda2017-10-2125-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This basically reverts c4d1a4efeec6f0b5b58222993aa0bec85a19b6a8
* | | | | | | | | | | | | | | | | | | [Action Pack] require => require_relativeAkira Matsuda2017-10-2137-70/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This basically reverts e9fca7668b9eba82bcc832cb0061459703368397, d08da958b9ae17d4bbe4c9d7db497ece2450db5f, d1fe1dcf8ab1c0210a37c2a78c1ee52cf199a66d, and 68eaf7b4d5f2bb56d939f71c5ece2d61cf6680a3
* | | | | | | | | | | | | | | | | | | [Active Record] require => require_relativeAkira Matsuda2017-10-2135-134/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This basically reverts 9d4f79d3d394edb74fa2192e5d9ad7b09ce50c6d
* | | | | | | | | | | | | | | | | | | [Active Model] require => require_relativeAkira Matsuda2017-10-217-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This basically reverts ee5cfc01a5797f854c8441539b0cae326a81b963
* | | | | | | | | | | | | | | | | | | [Active Support] require_relative => requireAkira Matsuda2017-10-21129-386/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This basically reverts 8da30ad6be34339124ba4cb4e36aea260dda12bc
* | | | | | | | | | | | | | | | | | | [Railties] require_relative => requireAkira Matsuda2017-10-2174-115/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This basically reverts 618268b4b9382f4bcf004a945fe2d85c0bd03e32
* | | | | | | | | | | | | | | | | | | Let Hash#slice return a HashAkira Matsuda2017-10-212-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to keep this method compatible with the Ruby 2.5 version of Hash#slice. This bahavior is actually slightly incompatibile with previous versions of Active Support but it might not cause a real problem, since HWIA, the biggest use case of Hash subclassing here, already overrides `slice` to return another HWIA.
* | | | | | | | | | | | | | | | | | | Move HWIA specific logic for slice and slice! to HWIA classAkira Matsuda2017-10-212-2/+10
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Hash#slice is in Ruby 2.5+Akira Matsuda2017-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since r60229
* | | | | | | | | | | | | | | | | | | Add test cases for `type` and `foreign_type` in the reflectionsRyuta Kamizono2017-10-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should be initialized only when polymorphic associations.
* | | | | | | | | | | | | | | | | | | bundle lock --add-platform javaAkira Matsuda2017-10-201-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "The dependency activerecord-jdbcsqlite3-adapter (>= 1.3.0) will be unused by any of the platforms Bundler is installing for. Bundler is installing for ruby, x64-mingw32, x86-mingw32 but the dependency is only for java. To add those platforms to the bundle, run `bundle lock --add-platform java`."
* | | | | | | | | | | | | | | | | | | Merge pull request #30928 from Altech/indifferent-ignored-columnsRyuta Kamizono2017-10-203-15/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow symbol list for ignored_columns
| * | | | | | | | | | | | | | | | | | | Convert ignored_columns to a list of stringAltech2017-10-203-15/+37
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #30936 from maxfelsher/html-escape-doc-fixRyuta Kamizono2017-10-201-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove obsolete documentation for html_escape [ci skip]
| * | | | | | | | | | | | | | | | | | | | Remove obsolete documentation [ci skip]Max Felsher2017-10-191-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instructions to use `h` or `html_escape` in ERB templates were added to `actionpack/lib/action_view/template_handlers/erb.rb` in a1b0349 (Rails 2.1), but ERB has automatically escaped values since Rails 3.
* | | | | | | | | | | | | | | | | | | | | Merge pull request #30938 from y-yagi/_return_correct_exit_status_of_ujs_testRyuta Kamizono2017-10-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | Return correct exit status of ujs test
| * | | | | | | | | | | | | | | | | | | | Return correct exit status of ujs testyuuji.yaginuma2017-10-201-1/+1
|/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Process::Status#to_i` returns the bits in stat. If need exit status, need to use `#exitstatus`. Ref: https://ruby-doc.org/core-2.4.0/Process/Status.html#method-i-to_i
* | | | | | | | | | | | | | | | | | | | Keep `:api: plugin` methods in the doc [ci skip]Ryuta Kamizono2017-10-202-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `:api:` tag was removed in 5349f231 since RDoc doesn't support `:api:` tag. But those methods are not private API, they are public API for renderers. The renderers should be able to know that they can override this method.
* | | | | | | | | | | | | | | | | | | | Merge pull request #30930 from rails/replace-phantomjs-with-chromeGuillermo Iguaran2017-10-196-151/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | PhantomJS is abandoned, replace it with Selenium/Chrome headless
| * | | | | | | | | | | | | | | | | | | Count assertions instead of tests in reportGuillermo Iguaran2017-10-191-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | PhantomJS is abandoned, replace it with Selenium/Chrome headlessGuillermo Iguaran2017-10-196-151/+31
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #29127 from DmytroVasin/rails-ujs-remote-callbacksGuillermo Iguaran2017-10-193-69/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix callback in rails ujs
| * | | | | | | | | | | | | | | | | | | Fix callback in rails ujsVasin Dmitriy2017-06-073-69/+34
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Test `ignored_columns` value is inheritable by subclassesRyuta Kamizono2017-10-192-0/+10
| | | | | | | | | | | | | | | | | | | |