aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7822 from lulalala/reset-counter-cache-for-has-many-throughRafael Mendonça França2012-10-025-4/+29
| | | | | | | Fix reset_counters crashing on has_many :through associations. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/counter_cache.rb
* Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variablesRafael Mendonça França2012-10-013-23/+29
| | | | | | | | | prefix TemplateAssertions ivars. Closes #7459 Conflicts: actionpack/lib/action_controller/test_case.rb actionpack/lib/action_view/test_case.rb
* Merge pull request #7789 from senny/7777_resource_functions_modify_optionsRafael Mendonça França2012-10-013-2/+27
| | | | resource and resources do no longer modify passed options
* Merge pull request #6450 from iHiD/resource_generator_routes_masterRafael Mendonça França2012-10-013-7/+116
| | | | | | | | Master branch: Fixed generated whitespace in routes when using namespaced resource. Merge pull request #7811 from iHiD/resource_generator_routes_master Fix the build (Broken scaffold routes test)
* Since File instance doesn't respond to #open use a double to test theRafael Mendonça França2012-09-303-5/+4
| | | | behavior added at c53e5def08f7a289a92a8e5f79dcd7caa5c3a2fb
* Asset manifest includes aliases for foo.js -> foo/index.js and vice versa. ↵Jeremy Kemper2012-09-304-22/+43
| | | | Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
* Merge pull request #7802 from steveklabnik/issue_7799Xavier Noria2012-09-301-1/+1
|\ | | | | Fix reference to code sample in Getting Started.
| * Fix reference to code sample in Getting Started.Steve Klabnik2012-09-301-1/+1
|/ | | | Fixes #7799.
* New CHANGELOG entries always in the top [ci skip]Rafael Mendonça França2012-09-301-6/+6
|
* Merge pull request #7659 from HugoLnx/template_error_no_matches_rebasedRafael Mendonça França2012-09-304-6/+55
| | | | | | | REBASED: fixing assert_template bug when template matches expected, but not ends with Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_controller/test_case.rb
* Merge pull request #7786 from yabawock/3-2-stableRafael Mendonça França2012-09-293-1/+14
|\ | | | | Backport "Don't paramify ActionDispatch::Http::UploadedFile in tests"
| * Don't paramify ActionDispatch::Http::UploadedFile in testsTim Vandecasteele2012-09-293-1/+14
| | | | | | | | | | | | | | | | | | | | To test uploading a file without using fixture_file_upload, a posted ActionDispatch::Http::UploadedFile should not be paramified (just like Rack::Test::UploadedFile). (Rack::Test::UploadedFile and ActionDispatch::Http::UploadedFile don't share the same API, tempfile is not accessible on Rack::Test::UploadedFile as discussed in https://github.com/brynary/rack-test/issues/30)
* | Merge pull request #7785 from okcwest/3-2-stableAaron Patterson2012-09-284-6/+13
|\ \ | |/ |/| backport 68677ffb8298105eb9d3efa26d928dd88cc5e006
| * backport 68677ffb8298105eb9d3efa26d928dd88cc5e006Evan Petrie2012-09-284-6/+13
| |
* | Hashrocket for 1.8 supportJeremy Kemper2012-09-281-2/+2
| |
* | Shush uninitialized @_layout warningJeremy Kemper2012-09-281-1/+1
|/
* Shush syntax warningsJeremy Kemper2012-09-281-3/+3
|
* Tune up Rails::Rack::Logger. Only put space between requests in development ↵Jeremy Kemper2012-09-272-20/+29
| | | | | | | logs. Conflicts: railties/test/application/rack/logger_test.rb
* Add logger.push_tags and .pop_tags to complement logger.taggedJeremy Kemper2012-09-273-18/+69
| | | | | | | | | Avoid memory leak from unflushed logs on other threads leaving tags behind. Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/tagged_logging.rb activesupport/test/tagged_logging_test.rb
* Log newlines separately to ensure the 'Started GET ...' line has a tag on ↵Jeremy Kemper2012-09-271-1/+2
| | | | the same line
* Only apply log tags if the logger supports itJeremy Kemper2012-09-271-1/+1
|
* Merge pull request #7684 from jrochkind/connection_pool_timeout_key_backportRafael Mendonça França2012-09-254-5/+39
|\ | | | | ConnectionPool accepts spec key 'checkout_timeout' (Backport)
| * ConnectionPool accepts spec key 'checkout_timeout'Jonathan Rochkind2012-09-244-5/+39
| | | | | | | | | | | | | | Backport of #6441 cb6f83935 . Old 'wait_timeout' is still supported, but conflicts with mysql2 using that spec key for different thing. 'checkout_timeout' can now be used taking precedence for ConnectionPool over 'wait_timeout'.
* | Fix invalid ruby 1.8 syntaxRafael Mendonça França2012-09-211-4/+5
|/
* Merge pull request #7723 from steveklabnik/backport_3554Rafael Mendonça França2012-09-214-5/+23
|\ | | | | Backport #3544 to 3-2-stable
| * Merge pull request #3544 from amatsuda/_field_changedAaron Patterson2012-09-214-5/+23
|/ | | | | | | | Rename field_changed? to _field_changed? so that users can create a field named field Conflicts: activerecord/lib/active_record/core.rb activerecord/test/cases/dirty_test.rb
* Revert "Revert "Respect `config.digest = false` for `asset_path`""Rafael Mendonça França2012-09-203-1/+20
| | | | | | This reverts commit 54f55746a70a7091341e84236498203118a7fbb4. Reason: the last commit fixed the failing case
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 20:08:23 +0000