aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Explictly set the assets digest option to falseRafael Mendonça França2012-09-201-2/+5
|
* Revert "Respect `config.digest = false` for `asset_path`"Rafael Mendonça França2012-09-203-20/+1
| | | | | | | | | | | | This reverts commit 1ac19c11792a745cd654f02dfaed8e93f95b3c70. Conflicts: actionpack/CHANGELOG.md Reason: This is causing failures in the railties build. See http://travis-ci.org/#!/rails/rails/jobs/2491787 Related with #7672
* Revert "backport fair connection pool 02b2335563 to 3-2-stable"Rafael Mendonça França2012-09-207-311/+51
| | | | | | | | | | | | | This reverts commit 0693e079708a52b777f2b7872b8e3d467b880a0d. Revert "Cache columns metadata to avoid extra while testing" This reverts commit a82f1e3f5d11c8dfba9f4c911745ec40a7965216. Reason: This is causing failures in the postgresql build. See http://travis-ci.org/#!/rails/rails/builds/2485584 Related with #7675
* Merge pull request #7718 from kennyj/fix_6962-32Rafael Mendonça França2012-09-203-1/+16
|\ | | | | [3-2-stable] Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z format strings.
| * Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z ↵kennyj2012-09-203-1/+16
|/ | | | format strings.
* Load the environment after creating the databaseJeremy Kemper2012-09-191-2/+2
| | | | | Conflicts: activerecord/lib/active_record/railties/databases.rake
* Merge pull request #7668 from Draiken/fix_issue_6497Rafael Mendonça França2012-09-193-1/+18
| | | | | | Removing to_shorthand to fix #6497 Conflicts: actionpack/CHANGELOG.md
* Cache columns metadata to avoid extra while testingRafael Mendonça França2012-09-183-1/+11
|
* Merge pull request #7686 from steveklabnik/add_upgrade_noteRafael Mendonça França2012-09-181-0/+122
|\ | | | | Add upgrading note to 3.1 release notes.
| * Add upgrading note to 3.1 release notes.Steve Klabnik2012-09-181-0/+122
|/ | | | See #7685.
* Merge pull request #7672 from wagenet/asset_path_digest_fixRafael Mendonça França2012-09-183-1/+20
|\ | | | | Respect `config.digest = false` for `asset_path`
| * Respect `config.digest = false` for `asset_path`Peter Wagenet2012-09-173-1/+20
|/ | | | | | | Previously, the `asset_path` internals only respected the `:digest` option, but ignored the global config setting. This meant that `config.digest = false` could not be used in conjunction with `config.compile = false` this corrects the behavior.
* Merge pull request #7675 from jrochkind/fair_conn_pool_backportRafael Mendonça França2012-09-174-50/+300
|\ | | | | backport fair connection pool 02b2335563 to 3-2-stable
| * backport fair connection pool 02b2335563 to 3-2-stableJonathan Rochkind2012-09-174-50/+300
|/
* log 404 status when ActiveRecord::RecordNotFound was raised (#7646)Yves Senn2012-09-174-3/+27
| | | | | | Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_controller/log_subscriber.rb
* Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmtRafael Mendonça França2012-09-173-0/+25
| | | | Fix collection= on hm:t join models when unsaved
* Merge pull request #7666 from ↵Rafael Mendonça França2012-09-171-1/+1
| | | | | | kennyj/fix_9fa3f102813eeeec440abd75870dfa7b23835665 Fix warning: method redefine. Testcase name are duplicated.
* Merge pull request #7651 from steveklabnik/issue_3956Rafael Mendonça França2012-09-162-2/+32
| | | | | | | | | Don't preserve SELECT columns on COUNT Closes #7651 Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb
* Backport explain fixes.Rafael Mendonça França2012-09-165-13/+27
| | | | | | | | * Mark as SCHEMA some schema database queries. #7648 * Don't explain queries except normal CRUD sql. #7657 Closes #6458 Closes #7544
* `skip` in Ruby 1.8 doesn't skip the test case without returnRafael Mendonça França2012-09-131-1/+1
|
* Merge pull request #7633 from frodsan/patch-5Carlos Antonio da Silva2012-09-131-1/+1
|\ | | | | Fix markdown markup in AR/CHANGELOG [ci skip]
| * fix markdown markup in AR/CHANGELOGFrancesco Rodríguez2012-09-131-1/+1
|/
* Merge pull request #7632 from stevecj/3-2-stableRafael Mendonça França2012-09-134-0/+82
|\ | | | | 3 2 stable
| * Backport PostgreSQL auto-reconnect test coverageSteve Jorgensen2012-09-134-0/+82
|/ | | | | | | | | | | | | | | | 6d5f4de4c420ebb906109668f5702a537ac77692 Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests. 4b1bca04025a66c54e6e9d5eb6e4d4056bfa92f0 Stop being silly with formatting of method aliasing. c381d5cbf959208adeb38e7859ee815dfbd2cf54 Fix just-plain-wrongness of psql auto-reconnect test. 1e17a9d367c54c680368be72f44247ae28b98904 Fix only-once stub logic. f16c2043826ec1991cf94fe17cb671507b7a7f51 Changelog for PostgreSQL auto-reconnect test coverage backport.
* Merge pull request #7603 from kennyj/fix_charset_vs_encoding_32Rafael Mendonça França2012-09-122-3/+9
|\ | | | | Backported #7572 to 3-2-stable. Use config['encoding'], because database configuration use not charset but encoding.
| * Backported #7572 to 3-2-stable. Use config['encoding'], because database ↵kennyj2012-09-122-3/+9
|/ | | | configuration use not charset but encoding.
* Merge pull request #7582 from tchandy/fix_type_cast_codeRafael Mendonça França2012-09-094-2/+36
|\ | | | | type_cast_code should always convert values to integer calling #to_i
| * ConnectionAdapters::Column.type_cast_code should always convert values to ↵Thiago Pradi2012-09-094-2/+36
| | | | | | | | integer calling #to_i
* | Fix AS tests due to builder change with nil values / empty stringsCarlos Antonio da Silva2012-09-071-2/+2
| | | | | | | | | | Check 0180e090ab6cbe66f7b521a0c03e278a0463accd for more reasoning about that.
* | Fix AR tests due to builder change with nil values / empty stringsCarlos Antonio da Silva2012-09-071-6/+6
| | | | | | | | | | Check 0180e090ab6cbe66f7b521a0c03e278a0463accd for more reasoning about that.
* | Update Active Model xml serialization test to reflect a change in builderCarlos Antonio da Silva2012-09-072-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a change in builder, nil values and empty strings now generates closed tags, so instead of this: <pseudonyms nil=\"true\"></pseudonyms> It generates this: <pseudonyms nil=\"true\"/> Document this change in Rails so that people can track it down easily if necessary. Conflicts: activemodel/CHANGELOG.md
* | Merge pull request #7337 from adzap/string_to_dummy_timeRafael Mendonça França2012-09-053-1/+23
| | | | | | | | | | | | Fix for time type columns with invalid time value Conflicts: activerecord/CHANGELOG.md
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 13:31:23 +0000