aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Quote these dates to prevent intermittent test failure. Suppose local time ↵Jon Leighton2011-08-042-4/+4
| | | | is 00:50 GMT+1. Without the quoting, the YAML parser would parse this as 00:50 UTC, into the local time of 01:50 GMT+1. Then, it would get written into the database in local time as 01:50. When it came back out the UTC date from the database and the UTC date of two weeks ago would be compared. The former would be 23:50, and the latter would be 00:50, so the two dates would differ, causing the assertion to fail. Quoting it prevents the YAML parser from getting involved.
* Fix a bit precompile and lazy compile commentsSantiago Pastorino2011-08-031-4/+2
|
* make assert_difference error message not suckAaron Patterson2011-08-031-5/+6
|
* Merge pull request #2413 from artemk/masterSantiago Pastorino2011-08-031-2/+4
|\ | | | | accept hash of options to recreate database for postgres adapter
| * accept option for recreate db for postgres (same as mysql now)artemk2011-08-041-2/+4
| |
* | Don't require assets group in production by default, you can change this ↵Santiago Pastorino2011-08-031-3/+7
| | | | | | | | default in the application.rb anyways
* | This dep is already defined in activerecord.gemspecSantiago Pastorino2011-08-031-2/+0
|/
* initializing @open_transactions in the initialize methodAaron Patterson2011-08-031-4/+2
|
* 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
| | | | Rails 3.1 throws a Errno::ENOTDIR if files are put in assets directories
* Merge pull request #2393 from bdurand/fix_cache_read_multiSantiago Pastorino2011-08-012-1/+9
|\ | | | | Fix ArgumentError in ActiveSupport::Cache::CacheStore.read_multi
| * Pass options in ActiveSupport::Cache::CacheStore#read_multi through to the ↵Brian Durand2011-08-012-1/+9
| | | | | | | | delete_entry call.
* | Merge pull request #2389 from ↵Santiago Pastorino2011-08-011-2/+0
|\ \ | | | | | | | | | | | | dmitriy-kiriyenko/remove_unnecessary_require_in_delegation Remove unnecessary require (happened after fcbde454f6)
| * | 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 StrictSanitizer
| * | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizerBogdan Gusiev2011-07-283-1/+19
| | | | | | | | | | | | | | | | | | In order to use StrictSanitizer in test mode Consider :id as not sensetive attribute that can be filtered from mass assignement without exception.
* | | Fix the issue where default_url_options is being cached on test cases. ↵thoefer2011-08-013-0/+35
| | | | | | | | | | | | | | | | | | Closes #1872. Closes #2031. Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Rename new method to_path to to_partial_path to avoid conflicts with ↵José Valim2011-08-0110-28/+28
| | | | | | | | | | | | File#to_path and similar.
* | | 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.
| * | | 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
| * | | | remove extra require for 'active_support/dependencies' as it is required in ↵Vishnu Atrai2011-07-311-1/+0
|/ / / / | | | | | | | | | | | | abstract_unit.rb
* | | | 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.rb
| * | | 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 a few properties
| * | | | fixes #2368. rake about not showing the middleware, db adapter and db schema ↵Vijay Dev2011-07-311-1/+1
|/ / / / | | | | | | | | | | | | version
* | | | Merge pull request #2371 from bradediger/issue-2346Jon Leighton2011-07-311-2/+7
|\ \ \ \ | |/ / / |/| | | remove_possible_method: test if method exists
| * | | remove_possible_method: test if method existsBrad Ediger2011-07-311-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This speeds up remove_possible_method substantially since it doesn't have to rescue a NameError in the common case. Closes #2346.
* | | | Merge pull request #2358 from arunagw/test_fix_187_skipJosé Valim2011-07-311-3/+4
|\ \ \ \ | | | | | | | | | | skiping magic comment test for < 1.9
| * | | | 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.
| * | | | Covering more files in test for plugin new generator. Vishnu Atrai2011-07-291-0/+2
| | | | |
* | | | | Merge pull request #2364 from ↵José Valim2011-07-301-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | bcardarella/resolve_undefined_instance_attributes_instance_variable Resolve warnings by instantizing @attrubtes as nil
| * | | | 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_keys
| * | | | 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 not return frozen objects
| * | | | Change ActiveSupport::Cache behavior to always return duplicate objects ↵Brian Durand2011-07-292-22/+18
| | |_|/ | |/| | | | | | | | | | instead of frozen objects.
* | | | 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. ↵Aaron Patterson2011-07-292-3/+16
| | | | | | | | | | | | | | | | fixes #1592
* | | | Merge pull request #2342 from ↵Santiago Pastorino2011-07-291-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bcardarella/remove_controller_instance_variable_warnings_from_sprocket_helper_test Resolve "instance variable @controller not initialized" warnings for sprocket_helper_test
| * | | | Instead of removing the instance variable just set it to nil, resolves the ↵Brian Cardarella2011-07-291-2/+2
| | | | | | | | | | | | | | | | | | | | warnings because of a missing instance variable
* | | | | Merge pull request #2344 from ↵Aaron Patterson2011-07-292-0/+12
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | bcardarella/resolve_warning_for_capture_helper_test Reset @dirty to false when slicing an instance of SafeBuffer
| * | | | 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 mailer
| * | | Test add for plugin new generator generate mailerArun Agrawal2011-07-291-4/+5
|/ / /