Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Fix Regression in Numericality Validations | Robert Eshleman | 2015-12-22 | 1 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A regression (#22744) introduced in 7500dae caused certain numericality validations to raise an error when run against an attribute with a string value. Previously, these validations would successfully run against string values because the value was cast to a numeric class. This commit resolves the regression by converting string values to floats before performing numericality comparison validations. [fixes #22744] | |||||
| * | | | Failing Tests for Validating String Numbericality | Robert Eshleman | 2015-12-22 | 1 | -0/+42 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Covers Regressions: * <= * < * == * > * >= * other than | |||||
* | | | | Merge pull request #22762 from djpowers/patch-1 | Rafael França | 2015-12-22 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | Fix letter case and grammar in Routing guide | |||||
| * | | | Fix letter case and grammar in Routing guide | Dave Powers | 2015-12-22 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #22620 from kamipo/join_to_delete_is_same_as_join_to_update | Rafael França | 2015-12-22 | 3 | -11/+5 | |
|\ \ \ | | | | | | | | | `join_to_delete` is same as `join_to_update` | |||||
| * | | | `join_to_delete` is same as `join_to_update` | Ryuta Kamizono | 2015-12-17 | 3 | -11/+5 | |
| | | | | | | | | | | | | | | | | Reapply #22615. | |||||
* | | | | Currectly test the Middleware#== | Rafael Mendonça França | 2015-12-22 | 1 | -4/+8 | |
| | | | | ||||||
* | | | | Merge pull request #22743 from maclover7/fix-22738 | Rafael Mendonça França | 2015-12-22 | 2 | -0/+21 | |
|\ \ \ \ | | | | | | | | | | | | | | | | Add #== back to ActionDispatch::MiddlewareStack::Middleware | |||||
| * | | | | Add #== back to ActionDispatch::MiddlewareStack::Middleware | Jon Moss | 2015-12-21 | 2 | -0/+21 | |
| | |/ / | |/| | | | | | | | | | | | | | | This was causing bug #22738 to occur. Also added extra tests to make sure everything is A-OK. | |||||
* | | | | Merge pull request #22749 from sblackstone/mysql2flags | Matthew Draper | 2015-12-23 | 2 | -2/+14 | |
|\ \ \ \ | | | | | | | | | | | Add support for passing flags to MySQL2 adapter by array | |||||
| * | | | | Add support for passing flags to MySQL2 adapter by array | Stephen Blackstone | 2015-12-22 | 2 | -2/+14 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #22757 from paulkogel/patch-1 | Rafael França | 2015-12-22 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | seeds.rb.tt: fix English. | |||||
| * | | | | seeds.rb.tt: fix English. | Paul Kögel | 2015-12-22 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #22758 from LaurierMantel/release_5_0_typo | Arun Agrawal | 2015-12-22 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | fixes typo in 5.0 release notes | |||||
| * | | | | | fixes typo in 5.0 release notes | Laurier Mantel | 2015-12-22 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #22755 from y-yagi/remove_cors_initializer_from_rails_app | Sean Griffin | 2015-12-22 | 2 | -0/+12 | |
|\ \ \ \ \ | |/ / / / |/| | | | | remove cors initializer from rails app | |||||
| * | | | | remove cors initializer from rails app | yuuji.yaginuma | 2015-12-22 | 2 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | `rack-cors` gem is defined in Gemfile by default only if the api, not defined by default in rails app. | |||||
* | | | | | release notes, extract notable changes from Action Mailer CHANGELOG. | Yves Senn | 2015-12-22 | 2 | -3/+21 | |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | release notes, extract notable changes from Action View CHANGELOG. | Yves Senn | 2015-12-22 | 2 | -7/+28 | |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | release notes, use past tense. [ci skip] | Yves Senn | 2015-12-22 | 1 | -15/+15 | |
| | | | | | ||||||
* | | | | | release notes, extract notable changes from Action Pack CHANGELOG. | Yves Senn | 2015-12-22 | 2 | -24/+139 | |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | [ci skip] Steal `ActionCable.server` mounting from routes template. | Kasper Timm Hansen | 2015-12-22 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Mounting it as prescribed here: https://github.com/rails/rails/blob/0d1d50c2db40ea1a9d3bebfb0c35da43bbd4d27f/railties/lib/rails/generators/rails/app/templates/config/routes.rb#L5 | |||||
* | | | | | release notes, extract notable changes from Railties CHANGELOG. | Yves Senn | 2015-12-22 | 2 | -9/+53 | |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | guides, restructure Rails 5.0 release notes. [ci skip] | Yves Senn | 2015-12-22 | 2 | -91/+160 | |
|/ / / / | | | | | | | | | | | | | | | | | xref #22701. xref #20612. | |||||
* | | | | Merge pull request #22701 from maclover7/rails-5-release-notes | Yves Senn | 2015-12-22 | 1 | -0/+188 | |
|\ \ \ \ | | | | | | | | | | | [WIP] Rails 5 release notes [ci skip] | |||||
| * | | | | Add Rails 5.0 Release Notes | Jon Moss | 2015-12-21 | 1 | -0/+188 | |
| | |/ / | |/| | | | | | | | | | | [ci skip] | |||||
* | | | | Merge pull request #22483 from y-yagi/use_bin_test_in_plugins_guide | Yves Senn | 2015-12-22 | 1 | -32/+67 | |
|\ \ \ \ | | | | | | | | | | | use `bin/test` in plugins guide [ci skip] | |||||
| * | | | | use `bin/test` in plugins guide [ci skip] | yuuji.yaginuma | 2015-12-22 | 1 | -32/+67 | |
| |/ / / | | | | | | | | | | | | | | | | | `bin/test` can use the same API as the `bin/rails test`, since it is possible to run a flexible test than rake, I think better to use a guide even `bin/test`. | |||||
* | | | | Merge pull request #22752 from y-yagi/remove_div_for_from_doc | Matthew Draper | 2015-12-22 | 1 | -8/+9 | |
|\ \ \ \ | | | | | | | | | | | do not use `div_for` in example [ci skip] | |||||
| * | | | | do not use `div_for` in example [ci skip] | yuuji.yaginuma | 2015-12-22 | 1 | -8/+9 | |
| |/ / / | | | | | | | | | | | | | `div_for` removed in 01e94ef | |||||
* | | | | Merge pull request #22754 from ryohashimoto/151222_remove_content_tag_for | Matthew Draper | 2015-12-22 | 1 | -7/+5 | |
|\ \ \ \ | | | | | | | | | | | remove content_tag_for example | |||||
| * | | | | remove content_tag_for example | Ryo Hashimoto | 2015-12-22 | 1 | -7/+5 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #22753 from gwincr11/keeps-options-breaks-assets | Matthew Draper | 2015-12-22 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | Fix .keep file issue with ActionCable | |||||
| * | | | Fix .keep file issue with ActionCable | Cory Gwin | 2015-12-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22708 Make sure the channels file is create in assets/javascript/ so require tree works in asset pipeline. | |||||
* | | | | Merge pull request #22746 from davidenglishmusic/master | Guillermo Iguaran | 2015-12-21 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | corrects a typo [ci-skip] | |||||
| * | | | | corrects a typo | David English | 2015-12-21 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #22709 from ↵ | Rafael França | 2015-12-21 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | jonatack/clarify-explanation-for-new-config-halt-callback-chains Clarify config settings for AS::halt_callback_chains_on_return_false | |||||
| * | | | | Clarify config settings for AS::halt_callback_chains_on_return_false | Jon Atack | 2015-12-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | [skip ci] | |||||
* | | | | | Merge pull request #22745 from claudiob/fix-hartl-link | Claudio B | 2015-12-21 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fix Rails tutorial link | |||||
| * | | | | Fix Rails tutorial link | claudiob | 2015-12-21 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] The old link is 404 not found. The link matches what the rest of the documentation already points to: * https://github.com/rails/rails/blame/2de2263118d6763c11a02db05079a5b7a97a0a34/guides/source/getting_started.md#L2052 * https://github.com/rails/rails/blame/2de2263118d6763c11a02db05079a5b7a97a0a34/README.md#L74 | |||||
* | | | | Merge pull request #22739 from akshay-vishnoi/fix-docs | Rafael França | 2015-12-21 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | [ci skip] Fix typo | |||||
| * | | | | [ci skip] Fix typo | Akshay Vishnoi | 2015-12-22 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #22685 from jeyb/remove_cable_files_for_skip_action_cable | Rafael França | 2015-12-21 | 2 | -0/+11 | |
|\ \ \ \ | | | | | | | | | | | Ensure Action Cable files are removed when `skip_action_cable` is set. | |||||
| * | | | | Ensure Action Cable files are removed when `skip_action_cable` is set. | Jey Balachandran | 2015-12-21 | 2 | -0/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Action Cable generators creates four files which need to be removed if `skip_action_cable` is set. 1. `app/assets/javascripts/cable.coffee` 2. `app/channels/application_cable/channel.rb` 3. `app/channels/application_cable/connection.rb` 4. `config/redis/cable.yml` Fixes #22669. | |||||
* | | | | | Use the generators options to not generate channel assets | Rafael Mendonça França | 2015-12-21 | 2 | -7/+6 | |
| | | | | | ||||||
* | | | | | Merge pull request #22727 from prathamesh-sonpatki/fix-master | Kasper Timm Hansen | 2015-12-21 | 1 | -1/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | Ensure that assets are enabled back after the test that tests assets are disabled | |||||
| * | | | | | Ensure that assets are enabled back after the test that tests assets are ↵ | Prathamesh Sonpatki | 2015-12-21 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | disabled | |||||
* | | | | | | Merge pull request #22736 from akshay-vishnoi/fix-changelogs | Rafael França | 2015-12-21 | 2 | -6/+0 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [ci skip] No more no changes entries in the CHANGELOGs (cases left in #22718) | |||||
| * | | | | | | [ci skip] No more no changes entries in the CHANGELOGs (cases left in #22718) | Akshay Vishnoi | 2015-12-22 | 2 | -6/+0 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #22735 from reshleman/patch-1 | Claudio B | 2015-12-21 | 1 | -2/+10 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update "Support" in ActionCable README [ci skip] |