aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge pull request #7718 from kennyj/fix_6962-32Rafael Mendonça França2012-09-203-1/+16
|\
| * Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z for...kennyj2012-09-203-1/+16
|/
* Load the environment after creating the databaseJeremy Kemper2012-09-191-2/+2
* Merge pull request #7668 from Draiken/fix_issue_6497Rafael Mendonça França2012-09-193-1/+18
* 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.Steve Klabnik2012-09-181-0/+122
|/
* 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`Peter Wagenet2012-09-173-1/+20
|/
* 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-stableJonathan Rochkind2012-09-174-50/+300
|/
* log 404 status when ActiveRecord::RecordNotFound was raised (#7646)Yves Senn2012-09-174-3/+27
* Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmtRafael Mendonça França2012-09-173-0/+25
* Merge pull request #7666 from kennyj/fix_9fa3f102813eeeec440abd75870dfa7b2383...Rafael Mendonça França2012-09-171-1/+1