aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adding a missing parenthesis in the doc of String#parameterize.Geoffrey Roguelon2012-10-241-1/+1
|
* Merge pull request #7514 from senny/issue_7503_3_2_stableRafael Mendonça França2012-09-036-2/+42
|\ | | | | set the configured #inheritance_column on #become (#7503)
| * set the configured #inheritance_column on #become (#7503)Yves Senn2012-09-036-2/+42
|/ | | | | | | | | | | | | | | | | | | I had to create a new table because I needed an STI table, which does not have both a "type" and a "custom_type" the test fails with: 1) Error: test_alt_becomes_works_with_sti(InheritanceTest): NoMethodError: undefined method `type=' for #<Cabbage id: 1, name: "my cucumber", custom_type: "Cucumber"> /Users/username/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:432:in `method_missing' /Users/username/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:100:in `method_missing' /Users/username/Projects/rails/activerecord/lib/active_record/persistence.rb:165:in `becomes' test/cases/inheritance_test.rb:134:in `test_becomes_works_with_sti' test/cases/inheritance_test.rb:140:in `test_alt_becomes_works_with_sti' Conflicts: activerecord/test/cases/inheritance_test.rb
* documents after_(commit|rollback)Xavier Noria2012-08-301-0/+18
|
* Merge pull request #7474 from steveklabnik/backport_89ebd28Piotr Sarnacki2012-08-292-1/+8
|\ | | | | Backport 89ebd28 to 3-2-stable
| * Fix bug when Rails.application is defined but is nil. See #881Marc-Andre Lafortune2012-08-282-1/+8
|/
* Ensure association preloading properly merges default scope and association ↵Pratik Naik2012-08-284-3/+25
| | | | | | | | conditions Conflicts: activerecord/test/models/reader.rb
* CHANGELOGs are now per branchXavier Noria2012-08-286-16740/+6
| | | | Check 810a50d for the rationale.
* fixes a bug in dependencies.rbXavier Noria2012-08-281-1/+1
| | | | | | | loaded stores file names without the .rb extension, but search_for_file returns file names with the extension. The solution is hackish, but this file needs a revamp.
* Merge pull request #7446 from nashby/backport-fix-issue-7431Rafael Mendonça França2012-08-253-2/+34
|\ | | | | backport #7435
| * correct handling of date selects when using both disabled and discard optionsVasiliy Ermolovich2012-08-253-2/+34
|/ | | | | | | | | | | | we should take disabled option not only from `html_options` hash but from `options` hash too like `build_select` method does it. So datetime_select("post", "updated_at", { :discard_minute => true }, { :disabled => true }) datetime_select("post", "updated_at", :discard_minute => true , :disabled => true) both these variants work now closes #7431
* Merge pull request #7438 from arunagw/3-2-stable-edge-rails-fixSantiago Pastorino2012-08-242-3/+4
|\ | | | | We need to have 1-0-stable for joureny gem in edge
| * We need to have 1-0-stable for joureny gem in edgeArun Agrawal2012-08-242-3/+4
|/ | | | | Problem : Edge rails can't bundle Fixes #7437
* Use Ruby 1.8 hash syntaxCarlos Antonio da Silva2012-08-212-3/+3
| | | | Introduced in backport 648c5a1369ed64608c3ca43a5ebc917687d20010.
* Use a model without counter cache to test read-only attributesRafael Mendonça França2012-08-211-9/+10
|
* Merge pull request #5210 from Pliny/masteriRafael Mendonça França2012-08-218-2/+36
| | | | | | | | Fix for #5200 Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/counter_cache.rb
* Merge pull request #7410 from sandeepravi/default_options_helper_valueRafael Mendonça França2012-08-213-0/+18
| | | | | | option_tags coerced to "" instead of nil Closes #7404
* Merge pull request #6986 from kennyj/fix_6975Rafael Mendonça França2012-08-213-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 Silva2012-08-213-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ça2012-08-182-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 Rafaniello2012-08-182-3/+3
| | | | | | | | See 02ca9151a043a4fefbb3f22edd05f0cd392fffaa
* | Ruby 1.8 doesn't have to_r defined to NilClass and Float.Rafael Mendonça França2012-08-181-5/+14
|/ | | | Use round to get the right conversion
* Merge pull request #7352 from aripollak/microsecond-timestampRafael Mendonça França2012-08-174-3/+10
| | | | | | Fix occasional microsecond conversion inaccuracy Conflicts: activerecord/CHANGELOG.md
* Increase benchmark time to 20 seconds.Jon Leighton2012-08-171-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 performanceJon Leighton2012-08-172-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 Silva2012-08-151-6/+0
|
* Merge pull request #7027 from erichmenge/patch/jruby_send_fileCarlos Antonio da Silva2012-08-152-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 Kemper2012-08-152-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 interchangeableRafael Mendonça França2012-08-158-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-invalidRafael Mendonça França2012-08-113-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_optionsRafael Mendonça França2012-08-115-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 allbrainopia2012-08-111-0/+5
| | | | | | | | session stores
| * Test actual content of permanent cookiebrainopia2012-08-101-1/+1
| |
| * Dont stream back cookie value if it was set to the same valuebrainopia2012-08-102-5/+19
| |
| * Revert "Revert "Merge pull request #6084 from ↵brainopia2012-08-102-0/+14
| | | | | | | | | | | | brainopia/support_for_magic_domain_on_all_stores"" This reverts commit a48ea6800ef712440b08c551f8041feb35de8cb4.
* | [guides] Add info about CHANGELOGs to contributing guidePiotr Sarnacki2012-08-111-0/+25
| |
* | Add CHANGELOG entry for #7286Rafael Mendonça França2012-08-101-0/+5
| |
* | Merge pull request #7286 from kennyj/fix_7191Rafael Mendonça França2012-08-102-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-stableSantiago Pastorino2012-08-091-0/+2
|\ | | | | Add html_escape note to CHANGELOG
| * Add html_escape note to CHANGELOGMark Turner2012-08-091-0/+2
|/
* Merge branch '3-2-8' into 3-2-stableSantiago Pastorino2012-08-0920-21/+49
|\
| * Bump to 3.2.8Santiago Pastorino2012-08-099-9/+9
| |
| * Add release date to CHANGELOGsSantiago Pastorino2012-08-097-7/+7
| |
| * Do not mark strip_tags result as html_safeSantiago Pastorino2012-08-093-3/+10
| | | | | | | | | | | | Thanks to Marek Labos & Nethemba CVE-2012-3465
| * escape select_tag :prompt valuesSantiago Pastorino2012-08-093-2/+15
| | | | | | | | CVE-2012-3463
| * Bump to 3.2.8.rc2Santiago Pastorino2012-08-039-9/+9
| |
| * Add CHANGELOG entrySantiago Pastorino2012-08-031-0/+2
| |
| * More `:rails_env` cleanup.Rafael Mendonça França2012-08-021-6/+6
| | | | | | | | `Rails.env` already use development if ENV["RAILS_ENV"] is not present.
| * Fix html_escape with Ruby 1.8Rafael Mendonça França2012-08-021-15/+26
| |
| * html_escape should escape single quotesSantiago Pastorino2012-08-0212-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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-24 07:43:18 +0000