aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add a migrate class method and delegate to the new instanceAaron Patterson2011-08-021-1/+4
* Ensure that .up and .down work as well.Christopher Meiklejohn2011-08-021-2/+13
* Support backwards compatible interface for migration down/up with rails 3.0.x.Christopher Meiklejohn2011-08-022-0/+25
* use File.directory? as Dir.exists? is only 1.9.2+Aaron Patterson2011-08-011-2/+2
* Merge pull request #2324 from zenapsis/3-1-stableSantiago Pastorino2011-08-013-3/+21
* Merge pull request #2393 from bdurand/fix_cache_read_multiSantiago Pastorino2011-08-012-1/+9
|\
| * Pass options in ActiveSupport::Cache::CacheStore#read_multi through to the de...Brian Durand2011-08-012-1/+9
* | Merge pull request #2389 from dmitriy-kiriyenko/remove_unnecessary_require_in...Santiago Pastorino2011-08-011-2/+0
|\ \
| * | Remove unnecessary require (happened after fcbde454f6)Dmitriy Kiriyenko2011-08-011-2/+0
|/ /
* | Merge pull request #2385 from bogdan/test_default_sanitizer2José Valim2011-08-013-1/+19
|\ \
| * | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizerBogdan Gusiev2011-07-283-1/+19
* | | Fix the issue where default_url_options is being cached on test cases. Closes...thoefer2011-08-013-0/+35
* | | Rename new method to_path to to_partial_path to avoid conflicts with File#to_...José Valim2011-08-0110-28/+28
* | | Merge pull request #2379 from arunagw/extra_require_removalSantiago Pastorino2011-07-316-6/+0
|\ \ \
| * | | Removing extra requires from the test. Already loaded in abstract_unit.Arun Agrawal2011-07-316-6/+0
* | | | Merge pull request #2377 from castlerock/remove_requireSantiago Pastorino2011-07-311-1/+0
|\ \ \ \
| * | | | remove extra require for 'active_support/dependencies' as it is required in a...Vishnu Atrai2011-07-311-1/+0
|/ / / /
* | | | Merge pull request #2370 from castlerock/remove_duplicate_requireSantiago Pastorino2011-07-311-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | remove extra require for 'stringio' as it is required in helper.rbVishnu Atrai2011-07-311-1/+0
* | | | Merge pull request #2375 from vijaydev/rakeaboutfixJosé Valim2011-07-311-1/+1
|\ \ \ \
| * | | | fixes #2368. rake about not showing the middleware, db adapter and db schema ...Vijay Dev2011-07-311-1/+1
|/ / / /
* | | | Merge pull request #2371 from bradediger/issue-2346Jon Leighton2011-07-311-2/+7
|\ \ \ \ | |/ / / |/| | |
| * | | remove_possible_method: test if method existsBrad Ediger2011-07-311-2/+7
* | | | Merge pull request #2358 from arunagw/test_fix_187_skipJosé Valim2011-07-311-3/+4
|\ \ \ \
| * | | | magic comment test only if encoding_aware?.Arun Agrawal2011-07-301-3/+4
* | | | | Merge pull request #2345 from castlerock/plugin_new_generator_more_default_fileSantiago Pastorino2011-07-301-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Covering more files in test for plugin new generator. Vishnu Atrai2011-07-291-0/+2
* | | | | Merge pull request #2364 from bcardarella/resolve_undefined_instance_attribut...José Valim2011-07-301-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Resolve warnings by instantizing @attrubtes as nilBrian Cardarella2011-07-301-0/+1
|/ / / /
* | | | Merge pull request #2354 from waynn/patch-1Santiago Pastorino2011-07-291-2/+2
|\ \ \ \
| * | | | remove redundant calls to stringify_keysWaynn Lue2011-07-291-2/+2
|/ / / /
* | | | Merge pull request #2353 from bdurand/no_freeze_cache_entriesAaron Patterson2011-07-292-22/+18
|\ \ \ \
| * | | | Change ActiveSupport::Cache behavior to always return duplicate objects inste...Brian Durand2011-07-292-22/+18
| | |_|/ | |/| |
* | | | delay backtrace scrubbing until we actually raise an exception. fixes #1936Aaron Patterson2011-07-291-7/+4
* | | | default writing the schema file as utf-8Aaron Patterson2011-07-291-1/+2
* | | | dump IO encoding value along with schema.rb so the file can be reloaded. fixe...Aaron Patterson2011-07-292-3/+16
* | | | Merge pull request #2342 from bcardarella/remove_controller_instance_variable...Santiago Pastorino2011-07-291-2/+2
|\ \ \ \
| * | | | Instead of removing the instance variable just set it to nil, resolves the wa...Brian Cardarella2011-07-291-2/+2
* | | | | Merge pull request #2344 from bcardarella/resolve_warning_for_capture_helper_...Aaron Patterson2011-07-292-0/+12
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Reset @dirty to false when slicing an instance of SafeBufferBrian Cardarella2011-07-292-0/+12
| |/ / /
* | | | Merge pull request #2343 from arunagw/test_add_for_plugin_new_genJosé Valim2011-07-291-4/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Test add for plugin new generator generate mailerArun Agrawal2011-07-291-4/+5
|/ / /
* | | Merge pull request #2339 from dgeb/mailers-in-pluginsJosé Valim2011-07-292-0/+1
|\ \ \
| * | | Include empty app/mailers directory in mountable and full pluginsDan Gebhardt2011-07-292-0/+1
|/ / /
* / / Tidy upSantiago Pastorino2011-07-282-5/+4
|/ /
* | Merge pull request #2327 from cesario/patch-1José Valim2011-07-281-1/+0
|\ \
| * | We don't need to require erb here.Franck Verrot2011-07-281-1/+0
* | | Merge pull request #2330 from thedarkone/resources-router-fixJosé Valim2011-07-282-8/+16
|\ \ \
| * | | Make use of the inherited initializer.thedarkone2011-07-281-3/+2
| * | | There is no need to be destructive with the passed-in options.thedarkone2011-07-282-6/+15