aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use bundler --pre for travis buildsJeremy Kemper2013-01-031-1/+1
|
* Bump bundler dep to 1.3.0.pre.4+ to introduce 'bundle binstubs <gem>'Jeremy Kemper2013-01-031-1/+1
|
* Reuse the Column integer converterRafael Mendonça França2013-01-031-1/+1
|
* Change duplicated test nameRafael Mendonça França2013-01-031-2/+2
|
* Merge pull request #8734 from jstirk/master-column_writer_to_i_errorsRafael Mendonça França2013-01-034-8/+37
|\ | | | | Fix undefined method `to_i' introduced in 3.2.9
| * Fix undefined method `to_i' introduced since 3.2.8Jason Stirk2013-01-044-8/+37
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes a bug introduced in 96a13fc7 which breaks behaviour of integer fields. In 3.2.8, setting the value of an integer field to a non-integer (eg. Array, Hash, etc.) would default to 1 (true) : # 3.2.8 p = Post.new p.category_id = [ 1, 2 ] p.category_id # => 1 p.category_id = { 3 => 4 } p.category_id # => 1 In 3.2.9 and above, this will raise a NoMethodError : # 3.2.9 p = Post.new p.category_id = [ 1, 2 ] NoMethodError: undefined method `to_i' for [1, 2]:Array Whilst at first blush this appear to be sensible, it combines in bad ways with scoping. For example, it is common to use scopes to control access to data : @collection = Posts.where(:category_id => [ 1, 2 ]) @new_post = @collection.new In 3.2.8, this would work as expected, creating a new Post object (albeit with @new_post.category_id = 1). However, in 3.2.9 this will cause the NoMethodError to be raised as above. It is difficult to avoid triggering this error without descoping before calling .new, breaking any apps running on 3.2.8 that rely on this behaviour. This patch deviates from 3.2.8 in that it does not retain the somewhat spurious behaviour of setting the attribute to 1. Instead, it explicitly sets these invalid values to nil : p = Post.new p.category_id = [ 1, 2 ] p.category_id # => nil This also fixes the situation where a scope using an array will "pollute" any newly instantiated records. @new_post = @collection.new @new_post.category_id # => nil Finally, 3.2.8 exhibited a behaviour where setting an object to an integer field caused it to be coerced to "1". This has not been retained, as it is spurious and surprising in the same way that setting Arrays and Heshes was : c = Category.find(6) p = Post.new # 3.2.8 p.category_id = c p.category_id # => 1 # This patch p.category_id = c p.category_id # => nil This commit includes explicit test cases that expose the original issue with calling new on a scope that uses an Array. As this is a common situation, an explicit test case is the best way to prevent regressions in the future. It also updates and separates existing tests to be explicit about the situation that is being tested (eg. AR objects vs. other objects vs. non-integers)
* Merge pull request #8732 from amatsuda/readme_call_yieldRafael Mendonça França2013-01-031-1/+1
|\ | | | | a tiny fix in the generated README
| * no, call <%= yield %>Akira Matsuda2013-01-041-1/+1
|/
* Merge pull request #8731 from amatsuda/readme_dir_treeGuillermo Iguaran2013-01-031-11/+15
|\ | | | | update directory tree in the generated README
| * update directory tree in the generated READMEAkira Matsuda2013-01-041-11/+15
| |
* | Add documentation to ActionDispatch::Http::UploadedFile#headersRafael Mendonça França2013-01-031-0/+1
| | | | | | | | [ci skip]
* | Merge pull request #8730 from robin850/masterRafael Mendonça França2013-01-032-3/+3
|\ \ | | | | | | Fix missing spaces in method definitions
| * | Fix missing spaces before and after equal signs in method definitionsRobin Dupret2013-01-032-3/+3
| | |
* | | Merge pull request #8729 from timraymond/help_message_for_install_scriptRafael Mendonça França2013-01-031-0/+5
|\ \ \ | | | | | | | | Adding a usage message to install.rb script
| * | | Adding a usage message to install.rb scriptTim Raymond2013-01-031-0/+5
|/ / / | | | | | | | | | | | | | | | | | | Previously, invoking the install.rb script with zero arguments caused it to attempt to install all gems without a version suffix, which would fail spectacularly. Failing gracefully with a usage message is more helpful to a first-time user.
* | | Merge pull request #8728 from amatsuda/model_all_returns_a_relationRafael Mendonça França2013-01-031-1/+1
|\ \ \ | |/ / |/| | A small fix for an AR test case
| * | need to to_a the Relation to execute SQL hereAkira Matsuda2013-01-041-1/+1
| |/
* | Merge pull request #8727 from robin850/patch-2Rafael Mendonça França2013-01-031-1/+0
|\ \ | | | | | | Remove a useless TODO comment
| * | Remove a useless TODO commentRobin Dupret2013-01-031-1/+0
|/ /
* | Merge pull request #8705 from amparo-luna/change_update_attributes_to_updateGuillermo Iguaran2013-01-0338-132/+181
|\ \ | | | | | | Rename update_attributes method to update
| * | Add Changelog entry regarding update_attibutes being renamed to updateAmparo Luna + Guillermo Iguaran2013-01-031-0/+7
| | |
| * | Updating default application templates to use update instead of ↵Amparo Luna + Guillermo Iguaran2013-01-034-6/+6
| | | | | | | | | | | | update_attributes
| * | Change guides to use update instead of update_attributesAmparo Luna + Guillermo Iguaran2013-01-037-19/+19
| | |
| * | Change docs to use update instead of update_attributesAmparo Luna + Guillermo Iguaran2013-01-038-12/+12
| | |
| * | Rename update_attributes method to update, keep update_attributes as an aliasAmparo Luna + Guillermo Iguaran2013-01-0319-95/+137
| | |
* | | Merge pull request #8725 from mattdbridges/patch-2Guillermo Iguaran2013-01-031-1/+1
|\ \ \ | | | | | | | | Typo and grammar fixes in the ActionPack CHANGELOG
| * | | Typo and grammar fixes in the ActionPack CHANGELOGMatt Bridges2013-01-031-1/+1
|/ / /
* | | Merge pull request #8713 from goshakkk/better-error-pageGuillermo Iguaran2013-01-032-12/+10
|\ \ \ | | | | | | | | Fix env toggling, improve error page styling
| * | | fix env toggling, improve error page stylingGosha Arinich2013-01-032-12/+10
| | | |
* | | | Merge pull request #8719 from pcasaretto/fix-actionview-doc-typoCarlos Antonio da Silva2013-01-031-1/+1
|\ \ \ \ | |_|_|/ |/| | | Fix typo on form_tag_helper.rb [ci skip]
| * | | Fix typo on form_tag_helper.rbPaulo Luis Franchini Casaretto2013-01-031-1/+1
|/ / / | | | | | | | | | The inline documentantion had a typo that was somewhat confusing.
* | | Merge pull request #8717 from amatsuda/scaffold_controller_test_patchCarlos Antonio da Silva2013-01-033-5/+5
|\ \ \ | | | | | | | | test PATCH method for update action in generated scaffold controller test rather than PUT
| * | | test PATCH method for update action in generated scaffold controller test ↵Akira Matsuda2013-01-033-5/+5
| | | | | | | | | | | | | | | | rather than PUT
* | | | Merge pull request #8715 from goshakkk/refactor-mapperCarlos Antonio da Silva2013-01-031-9/+4
|\ \ \ \ | | | | | | | | | | Refactor Routing::Mapper#matches?
| * | | | refactor Routing::MapperGosha Arinich2013-01-031-9/+4
| | |/ / | |/| |
* | | | Merge pull request #8714 from utkarshkukreti/faster-gem-installCarlos Antonio da Silva2013-01-032-5/+5
|\ \ \ \ | |_|/ / |/| | | Pass in `--local` when doing `gem install` for local gems. [ci skip]
| * | | Pass in `--local` when doing `gem install` for local gems.Utkarsh Kukreti2013-01-032-5/+5
|/ / /
* | | Merge pull request #8706 from steveklabnik/ip_precautionsRafael Mendonça França2013-01-021-3/+4
|\ \ \ | | | | | | | | Explain the possible IP precautions
| * | | Explain the possible precautionsAndre Arko2013-01-021-3/+4
|/ / /
* | | Merge pull request #7980 from steveklabnik/issue_7979Guillermo Iguaran2013-01-025-113/+166
|\ \ \ | | | | | | | | Restore original remote_ip algorithm.
| * | | Restore original remote_ip algorithm.Andre Arko2013-01-025-113/+166
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Proxy servers add X-Forwarded-For headers, resulting in a list of IPs. We remove trusted IP values, and then take the last given value, assuming that it is the most likely to be the correct, unfaked value. See [1] for a very thorough discussion of why that is the best option we have at the moment. [1]: http://blog.gingerlime.com/2012/rails-ip-spoofing-vulnerabilities-and-protection/ Fixes #7979
* | | Changelog improvements [ci skip]Carlos Antonio da Silva2013-01-023-4/+5
| | |
* | | missing changelog entry for #8682Akira Matsuda2013-01-021-0/+4
|/ /
* | Merge pull request #8697 from goshakkk/undupRafael Mendonça França2013-01-021-5/+3
|\ \ | | | | | | Remove another unnecessary dup
| * | remove another unnecessary dupGosha Arinich2013-01-021-5/+3
| | |
* | | CVE-2012-5664 options hashes should only be extracted if there are extra ↵Aaron Patterson2013-01-021-0/+12
| | | | | | | | | | | | | | | | | | | | | parameters Conflicts: activerecord/lib/active_record/dynamic_matchers.rb
* | | Merge pull request #8701 from senny/8700_double_slash_with_trailing_slashRafael Mendonça França2013-01-023-7/+33
|\ \ \ | | | | | | | | do not append a second slash when using `trailing_slash: true`
| * | | do not append a second slash when usingYves Senn2013-01-023-7/+33
| |/ /
* | | Fixing closing </p>Guillermo Iguaran2013-01-021-1/+1
| | |
* | | Merge pull request #8702 from rubys/masterGuillermo Iguaran2013-01-022-8/+7
|\ \ \ | | | | | | | | Fix a number of validation/style errors
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-26 10:11:24 +0000