aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #7371 from csmuc/fix_dup_validation_errorsSantiago Pastorino2012-10-173-0/+21
* | Synchronize around deleting from the reserved connections hash.Aaron Patterson2012-10-152-1/+4
* | Merge pull request #7940 from arturopie/7914-backport-to-3-2-stableRafael Mendonça França2012-10-144-14/+61
|\ \
| * | 7914 Using a better way to get the defaults from db.Arturo Pie2012-10-141-12/+7
| * | #7914 get default value when type uses schema nameArturo Pie2012-10-144-2/+54
|/ /
* | Merge pull request #7925 from ernie/3-2-fix-collection-associations-with-selectRafael Mendonça França2012-10-123-1/+15
|\ \
| * | Fix has_many assocation w/select load after createErnie Miller2012-10-123-1/+15
|/ /
* | Merge pull request #7905 from jfirebaugh/eager_autoload_3-2Rafael Mendonça França2012-10-102-15/+21
|\ \
| * | Eager autoload Preloader classesJohn Firebaugh2012-10-101-10/+14
| * | Eager autoload ActiveRecord association helpersMichael Fairley2012-10-101-5/+7
|/ /
* | Backport 1a7049906ee6735bae058e9985a3806d08d9746bJeremy Kemper2012-10-061-3/+6
* | Merge pull request #7865 from teleological/link_to_remote_3_2Rafael Mendonça França2012-10-063-1/+12
|\ \
| * | Accept :remote as symbol in link_to optionsRiley2012-10-063-1/+12
* | | Use the Ruby 1.8 hash syntaxRafael Mendonça França2012-10-061-1/+1
|/ /
* | Merge pull request #7848 from senny/3415_assert_template_has_nil_variableRafael Mendonça França2012-10-063-3/+23
* | Merge pull request #7850 from senny/5920_postgres_adapter_table_with_capital_...Rafael Mendonça França2012-10-063-5/+14
* | Merge pull request #6978 from frodsan/count_nosql_unsaved_parentRafael Mendonça França2012-10-045-0/+37
* | Merge pull request #7836 from lihanli/error-msg-updateRafael Mendonça França2012-10-032-2/+6
|\ \
| * | Update supported ruby versions error message in ruby_version_check.rblihan2012-10-032-2/+6
|/ /
* | RefactorSantiago Pastorino2012-10-031-5/+3
* | Merge pull request #7822 from lulalala/reset-counter-cache-for-has-many-throughRafael Mendonça França2012-10-025-4/+29
* | Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variablesRafael Mendonça França2012-10-013-23/+29
* | Merge pull request #7789 from senny/7777_resource_functions_modify_optionsRafael Mendonça França2012-10-013-2/+27
* | Merge pull request #6450 from iHiD/resource_generator_routes_masterRafael Mendonça França2012-10-013-7/+116
* | Since File instance doesn't respond to #open use a double to test theRafael Mendonça França2012-09-303-5/+4
* | Asset manifest includes aliases for foo.js -> foo/index.js and vice versa. Bu...Jeremy Kemper2012-09-304-22/+43
* | Merge pull request #7802 from steveklabnik/issue_7799Xavier Noria2012-09-301-1/+1
|\ \
| * | Fix reference to code sample in Getting Started.Steve Klabnik2012-09-301-1/+1
|/ /
* | 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
* | Merge pull request #7786 from yabawock/3-2-stableRafael Mendonça França2012-09-293-1/+14
|\ \
| * | Don't paramify ActionDispatch::Http::UploadedFile in testsTim Vandecasteele2012-09-293-1/+14
* | | Merge pull request #7785 from okcwest/3-2-stableAaron Patterson2012-09-284-6/+13
|\ \ \ | |/ / |/| |
| * | 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 l...Jeremy Kemper2012-09-272-20/+29
* | Add logger.push_tags and .pop_tags to complement logger.taggedJeremy Kemper2012-09-273-18/+69
* | Log newlines separately to ensure the 'Started GET ...' line has a tag on the...Jeremy Kemper2012-09-271-1/+2
* | 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'Jonathan Rochkind2012-09-244-5/+39
* | | 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
|\ \
| * | Merge pull request #3544 from amatsuda/_field_changedAaron Patterson2012-09-214-5/+23
|/ /
* | Revert "Revert "Respect `config.digest = false` for `asset_path`""Rafael Mendonça França2012-09-203-1/+20
* | 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
* | Revert "backport fair connection pool 02b2335563 to 3-2-stable"Rafael Mendonça França2012-09-207-311/+51