aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | fixed support for DATABASE_URL for rake db tasksGrace Liu2012-10-296-37/+287
* | | Bump to 3.2.9.rc1Santiago Pastorino2012-10-299-17/+17
|/ /
* | Add 3.2.9 section in ARes CHANGELOGSantiago Pastorino2012-10-291-0/+4
* | Revert "Deprecate Paths::Path#children which is unused now"Rafael Mendonça França2012-10-291-1/+0
* | Merge pull request #7587 from elia/fix-too-eager-loadingRafael Mendonça França2012-10-293-6/+17
|\ \
| * | Deprecate Paths::Path#children which is unused nowElia Schito2012-10-291-0/+1
| * | Respect children paths filter settingsElia Schito2012-10-282-6/+13
| * | Add test case to assets eager loadRafael Mendonça França2012-10-271-0/+3
* | | Merge pull request #8057 from frodsan/fix_sqlite_mutate_argRafael Mendonça França2012-10-292-1/+9
* | | Merge pull request #8053 from henrik/update_columns_with_primary_keyCarlos Antonio da Silva2012-10-293-1/+17
* | | Make Active Record tests pass in isolationRafael Mendonça França2012-10-292-3/+2
* | | Fix the skip code.Rafael Mendonça França2012-10-281-4/+4
* | | Merge pull request #7593 from veader/patch-1Rafael Mendonça França2012-10-283-0/+14
* | | Merge pull request #8048 from senny/7761_dont_render_view_without_mail_callRafael Mendonça França2012-10-285-1/+34
* | | Merge pull request #8047 from arunagw/json_only_in_18Carlos Antonio da Silva2012-10-281-1/+0
|\ \ \
| * | | Removing JSON for other rubyArun Agrawal2012-10-281-1/+0
|/ / /
* / / Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependencyJeremy Kemper2012-10-274-5/+6
|/ /
* | Merge pull request #8022 from GRoguelon/3-2-stableRafael Mendonça França2012-10-241-1/+1
|\ \
| * | Adding a missing parenthesis in the doc of String#parameterize.Geoffrey Roguelon2012-10-241-1/+1
* | | frozen state should be restored after txn is abortedAaron Patterson2012-10-222-2/+18
* | | Merge pull request #7986 from Grandrath/patch-2Carlos Antonio da Silva2012-10-201-1/+1
|\ \ \
| * | | Use `Rails.env` instead of `ENV['RAILS_ENV']`; #7951Martin Grandrath2012-10-181-1/+1
* | | | Require ActionController::Railtie in the default middleware stack.Rafael Mendonça França2012-10-181-0/+2
* | | | Merge pull request #7989 from senny/backport_7969Rafael Mendonça França2012-10-181-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | active_model/validations requires necessary files to runYves Senn2012-10-181-0/+1
|/ / /
* | | 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