Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7410 from sandeepravi/default_options_helper_value | Rafael Mendonça França | 2012-08-21 | 3 | -0/+18 |
| | | | | | | option_tags coerced to "" instead of nil Closes #7404 | ||||
* | Merge pull request #6986 from kennyj/fix_6975 | Rafael Mendonça França | 2012-08-21 | 3 | -5/+34 |
| | | | | | | | Fix #6975. Round usec when writing timestamp attribute. Conflicts: activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | ||||
* | Merge pull request #7377 from ↵ | Carlos Antonio da Silva | 2012-08-21 | 3 | -1/+11 |
| | | | | | | | | | | | brainopia/use_inversed_parent_for_first_and_last_child Use inversed parent for first and last child of has_many association [Backport] Closes #3223. Conflicts: activerecord/lib/active_record/associations/collection_association.rb | ||||
* | Merge pull request #7388 from ↵ | Rafael Mendonça França | 2012-08-18 | 2 | -3/+3 |
|\ | | | | | | | | | ManageIQ/fix_table_remove_passing_array_deprecation Table#remove passed an array to remove_column, which is deprecated. | ||||
| * | Table#remove passed an array to remove_column, which is deprecated. | Joe Rafaniello | 2012-08-18 | 2 | -3/+3 |
| | | | | | | | | See 02ca9151a043a4fefbb3f22edd05f0cd392fffaa | ||||
* | | Ruby 1.8 doesn't have to_r defined to NilClass and Float. | Rafael Mendonça França | 2012-08-18 | 1 | -5/+14 |
|/ | | | | Use round to get the right conversion | ||||
* | Merge pull request #7352 from aripollak/microsecond-timestamp | Rafael Mendonça França | 2012-08-17 | 4 | -3/+10 |
| | | | | | | Fix occasional microsecond conversion inaccuracy Conflicts: activerecord/CHANGELOG.md | ||||
* | Increase benchmark time to 20 seconds. | Jon Leighton | 2012-08-17 | 1 | -18/+18 |
| | | | | | | | | | I think that 5 seconds was a bit low for our purposes. Also enable it to be configured via env vars. We also need to scale the number of records up/down depending on how long we're running the benchmark for. | ||||
* | Use benchmark/ips to measure AR performance | Jon Leighton | 2012-08-17 | 2 | -39/+36 |
| | | | | | | This means we can more easily compare numbers, and we don't have to specify a single N for all reports, which previously meant that some tests were running many more/fewer iterations than necessary. | ||||
* | Remove duplicated changelog entry [ci skip] | Carlos Antonio da Silva | 2012-08-15 | 1 | -6/+0 |
| | |||||
* | Merge pull request #7027 from erichmenge/patch/jruby_send_file | Carlos Antonio da Silva | 2012-08-15 | 2 | -2/+28 |
|\ | | | | | Backport 5c51cd0 to fix an issue with jRuby encodings. Fixes #6844 | ||||
| * | Backport 5c51cd0: #send_file leans on Rack::Sendfile to X-Accel-Redirect the ↵ | Jeremy Kemper | 2012-08-15 | 2 | -2/+28 |
| | | | | | | | | file's path, so opening the file to set the response body is wasteful. Set a FileBody wrapper instead that responds to to_path and streams the file if needed. | ||||
* | | Do not use update_column where update_attribute is not interchangeable | Rafael Mendonça França | 2012-08-15 | 8 | -39/+32 |
|/ | | | | | | | | | | | | Revert "Deprecate update_attribute." This reverts commit b081f6b59fb3f15d12043072ad9b331ffd2bc56e. Reason: Since the new deprecation policy we removed the deprecation of update_attribute but we didn't reverted the changes to use update_column. Fixes #7306 | ||||
* | Merge pull request #6073 from daveyeu/restore-state-on-record-invalid | Rafael Mendonça França | 2012-08-11 | 3 | -1/+23 |
| | | | | | | Restore state on create when ActiveRecord::RecordInvalid is raised Conflicts: activerecord/CHANGELOG.md | ||||
* | Merge pull request #7316 from brainopia/backport_fix_session_store_options | Rafael Mendonça França | 2012-08-11 | 5 | -5/+38 |
|\ | | | | | Backport of "Support cookie jar options for all cookie stores" for 3.2-stable | ||||
| * | Update changelog to reflect support of cookie jar options for all | brainopia | 2012-08-11 | 1 | -0/+5 |
| | | | | | | | | session stores | ||||
| * | Test actual content of permanent cookie | brainopia | 2012-08-10 | 1 | -1/+1 |
| | | |||||
| * | Dont stream back cookie value if it was set to the same value | brainopia | 2012-08-10 | 2 | -5/+19 |
| | | |||||
| * | Revert "Revert "Merge pull request #6084 from ↵ | brainopia | 2012-08-10 | 2 | -0/+14 |
| | | | | | | | | | | | | brainopia/support_for_magic_domain_on_all_stores"" This reverts commit a48ea6800ef712440b08c551f8041feb35de8cb4. | ||||
* | | [guides] Add info about CHANGELOGs to contributing guide | Piotr Sarnacki | 2012-08-11 | 1 | -0/+25 |
| | | |||||
* | | Add CHANGELOG entry for #7286 | Rafael Mendonça França | 2012-08-10 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #7286 from kennyj/fix_7191 | Rafael Mendonça França | 2012-08-10 | 2 | -13/+28 |
|/ | | | | | | Fix #7191. Remove unnecessary transaction when assigning has_one associations. Conflicts: activerecord/test/cases/associations/has_one_associations_test.rb | ||||
* | Merge pull request #7309 from amerine/3-2-stable | Santiago Pastorino | 2012-08-09 | 1 | -0/+2 |
|\ | | | | | Add html_escape note to CHANGELOG | ||||
| * | Add html_escape note to CHANGELOG | Mark Turner | 2012-08-09 | 1 | -0/+2 |
|/ | |||||
* | Merge branch '3-2-8' into 3-2-stable | Santiago Pastorino | 2012-08-09 | 20 | -21/+49 |
|\ | |||||
| * | Bump to 3.2.8 | Santiago Pastorino | 2012-08-09 | 9 | -9/+9 |
| | | |||||
| * | Add release date to CHANGELOGs | Santiago Pastorino | 2012-08-09 | 7 | -7/+7 |
| | | |||||
| * | Do not mark strip_tags result as html_safe | Santiago Pastorino | 2012-08-09 | 3 | -3/+10 |
| | | | | | | | | | | | | Thanks to Marek Labos & Nethemba CVE-2012-3465 | ||||
| * | escape select_tag :prompt values | Santiago Pastorino | 2012-08-09 | 3 | -2/+15 |
| | | | | | | | | CVE-2012-3463 | ||||
| * | Bump to 3.2.8.rc2 | Santiago Pastorino | 2012-08-03 | 9 | -9/+9 |
| | | |||||
| * | Add CHANGELOG entry | Santiago Pastorino | 2012-08-03 | 1 | -0/+2 |
| | | |||||
| * | More `:rails_env` cleanup. | Rafael Mendonça França | 2012-08-02 | 1 | -6/+6 |
| | | | | | | | | `Rails.env` already use development if ENV["RAILS_ENV"] is not present. | ||||
| * | Fix html_escape with Ruby 1.8 | Rafael Mendonça França | 2012-08-02 | 1 | -15/+26 |
| | | |||||
| * | html_escape should escape single quotes | Santiago Pastorino | 2012-08-02 | 12 | -63/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content Closes #7215 Conflicts: actionpack/test/template/erb_util_test.rb actionpack/test/template/form_tag_helper_test.rb actionpack/test/template/text_helper_test.rb actionpack/test/template/url_helper_test.rb activesupport/lib/active_support/core_ext/string/output_safety.rb | ||||
| * | Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` at | Rafael Mendonça França | 2012-08-02 | 2 | -4/+9 |
| | | | | | | | | | | | | | | the ERB scaffold generator. We are trying to teach the data attributes as best practices and `:confirm` will be deprecated in 4.0. | ||||
| * | Do not consider the numeric attribute as changed if the old value is | Rafael Mendonça França | 2012-08-02 | 3 | -2/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zero and the new value is not a string. Before this commit this was the behavior r = Review.find_by_issue(0) r.issue => 0 r.changes => {} r.issue = 0 => 0 r.changed? => true r.changes => {"issue"=>[0,0]} Fixes #7237 | ||||
| * | Fix ActiveSupport integration with Mocha > 0.12.1 | Mike Gunderloy | 2012-08-02 | 1 | -1/+3 |
| | | | | | | | | | | | | Mocha 0.12.2 renames the Integration module to MonkeyPatching. This breaks the code Rails uses to retrieve the assertion counter from Mocha. | ||||
* | | Merge pull request #7299 from iHiD/3-2-stable-store | Rafael Mendonça França | 2012-08-09 | 5 | -2/+22 |
|\ \ | | | | | | | | | | Ported PR #4856 to 3-2-stable. | ||||
| * | | Add CHANGELOG entry | Rafael Mendonça França | 2012-08-09 | 1 | -0/+5 |
| | | | |||||
| * | | Backport #7173. | Jeremy Walker | 2012-08-09 | 1 | -2/+4 |
| | | | |||||
| * | | Ported PR #4856 to 3-2-stable. | Jeremy Walker | 2012-08-09 | 4 | -2/+15 |
|/ / | |||||
* | | Fix CHANGELOG [ci skip] | Rafael Mendonça França | 2012-08-08 | 1 | -1/+4 |
| | | |||||
* | | Remove references to old behavior with headers at | Rafael Mendonça França | 2012-08-07 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Integration::ResquestHelpers. The behavior has removed at 4a6f4b92ad2f48dc7906d223fe4708d36624bd50 to increase the compatibility with Rack::Test Closes #7136 [ci skip] | ||||
* | | Merge pull request #7284 from josh/fix-asset-tests | Rafael Mendonça França | 2012-08-07 | 1 | -3/+2 |
|\ \ | | | | | | | Fix asset integration test (3-2-stable) | ||||
| * | | Fix invalid asset compile assertions | Joshua Peek | 2012-08-07 | 1 | -3/+2 |
|/ / | | | | | | | Logical paths to compile should require an extension | ||||
* | | make assertions easier to track down | Aaron Patterson | 2012-08-07 | 1 | -9/+17 |
| | | |||||
* | | Merge pull request #7283 from josh/bump-sprockets | David Heinemeier Hansson | 2012-08-07 | 1 | -1/+1 |
|\ \ | | | | | | | Allow newer versions of Sprockets | ||||
| * | | Loosen sprockets version restriction | Joshua Peek | 2012-08-07 | 1 | -1/+1 |
|/ / | |||||
* | | Add CHANGELOG entry for a935c7a | Rafael Mendonça França | 2012-08-06 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #5872 from evtuhovich/prepared_statement_fix | Aaron Patterson | 2012-08-06 | 1 | -10/+10 |
| | | | | | | | | | | | | Remove prepared statement from system query in postgresql adapter Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb |