Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2356 from waynn/fix_symbol | Santiago Pastorino | 2011-08-04 | 2 | -4/+28 |
|\ | | | | | fix stringify_keys destructive behavior for most FormTagHelper functions | ||||
| * | fix stringify_keys destructive behavior for most FormTagHelper functions | Waynn Lue | 2011-08-03 | 2 | -4/+28 |
| | | | | | | | | add four new tests to verify that the other three methods that called stringify_keys! are fixed. verified that the tests break in master without the code patch. Closes #2355 | ||||
* | | Quote these dates to prevent intermittent test failure. Suppose local time ↵ | Jon Leighton | 2011-08-04 | 2 | -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 comments | Santiago Pastorino | 2011-08-03 | 1 | -4/+2 |
| | | |||||
* | | make assert_difference error message not suck | Aaron Patterson | 2011-08-03 | 1 | -5/+6 |
| | | |||||
* | | Merge pull request #2413 from artemk/master | Santiago Pastorino | 2011-08-03 | 1 | -2/+4 |
|\ \ | | | | | | | accept hash of options to recreate database for postgres adapter | ||||
| * | | accept option for recreate db for postgres (same as mysql now) | artemk | 2011-08-04 | 1 | -2/+4 |
| | | | |||||
* | | | Don't require assets group in production by default, you can change this ↵ | Santiago Pastorino | 2011-08-03 | 1 | -3/+7 |
| | | | | | | | | | | | | default in the application.rb anyways | ||||
* | | | This dep is already defined in activerecord.gemspec | Santiago Pastorino | 2011-08-03 | 1 | -2/+0 |
|/ / | |||||
* | | initializing @open_transactions in the initialize method | Aaron Patterson | 2011-08-03 | 1 | -4/+2 |
| | | |||||
* | | add a migrate class method and delegate to the new instance | Aaron Patterson | 2011-08-02 | 1 | -1/+4 |
| | | |||||
* | | Ensure that .up and .down work as well. | Christopher Meiklejohn | 2011-08-02 | 1 | -2/+13 |
| | | |||||
* | | Support backwards compatible interface for migration down/up with rails 3.0.x. | Christopher Meiklejohn | 2011-08-02 | 2 | -0/+25 |
| | | |||||
* | | use File.directory? as Dir.exists? is only 1.9.2+ | Aaron Patterson | 2011-08-01 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #2324 from zenapsis/3-1-stable | Santiago Pastorino | 2011-08-01 | 3 | -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_multi | Santiago Pastorino | 2011-08-01 | 2 | -1/+9 |
|\ \ | | | | | | | Fix ArgumentError in ActiveSupport::Cache::CacheStore.read_multi | ||||
| * | | Pass options in ActiveSupport::Cache::CacheStore#read_multi through to the ↵ | Brian Durand | 2011-08-01 | 2 | -1/+9 |
| | | | | | | | | | | | | delete_entry call. | ||||
* | | | Merge pull request #2389 from ↵ | Santiago Pastorino | 2011-08-01 | 1 | -2/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | dmitriy-kiriyenko/remove_unnecessary_require_in_delegation Remove unnecessary require (happened after fcbde454f6) | ||||
| * | | | Remove unnecessary require (happened after fcbde454f6) | Dmitriy Kiriyenko | 2011-08-01 | 1 | -2/+0 |
|/ / / | |||||
* | | | Merge pull request #2385 from bogdan/test_default_sanitizer2 | José Valim | 2011-08-01 | 3 | -1/+19 |
|\ \ \ | | | | | | | | | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer | ||||
| * | | | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer | Bogdan Gusiev | 2011-07-28 | 3 | -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. ↵ | thoefer | 2011-08-01 | 3 | -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é Valim | 2011-08-01 | 10 | -28/+28 |
| | | | | | | | | | | | | | | | | File#to_path and similar. | ||||
* | | | | Merge pull request #2379 from arunagw/extra_require_removal | Santiago Pastorino | 2011-07-31 | 6 | -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 Agrawal | 2011-07-31 | 6 | -6/+0 |
| | | | | | |||||
* | | | | | Merge pull request #2377 from castlerock/remove_require | Santiago Pastorino | 2011-07-31 | 1 | -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 Atrai | 2011-07-31 | 1 | -1/+0 |
|/ / / / / | | | | | | | | | | | | | | | | abstract_unit.rb | ||||
* | | | | | Merge pull request #2370 from castlerock/remove_duplicate_require | Santiago Pastorino | 2011-07-31 | 1 | -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.rb | Vishnu Atrai | 2011-07-31 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merge pull request #2375 from vijaydev/rakeaboutfix | José Valim | 2011-07-31 | 1 | -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 Dev | 2011-07-31 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | version | ||||
* | | | | | Merge pull request #2371 from bradediger/issue-2346 | Jon Leighton | 2011-07-31 | 1 | -2/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | remove_possible_method: test if method exists | ||||
| * | | | | remove_possible_method: test if method exists | Brad Ediger | 2011-07-31 | 1 | -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_skip | José Valim | 2011-07-31 | 1 | -3/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | skiping magic comment test for < 1.9 | ||||
| * | | | | | magic comment test only if encoding_aware?. | Arun Agrawal | 2011-07-30 | 1 | -3/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #2345 from castlerock/plugin_new_generator_more_default_file | Santiago Pastorino | 2011-07-30 | 1 | -0/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Covering more files in test for plugin new generator. | ||||
| * | | | | Covering more files in test for plugin new generator. | Vishnu Atrai | 2011-07-29 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge pull request #2364 from ↵ | José Valim | 2011-07-30 | 1 | -0/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | bcardarella/resolve_undefined_instance_attributes_instance_variable Resolve warnings by instantizing @attrubtes as nil | ||||
| * | | | | Resolve warnings by instantizing @attrubtes as nil | Brian Cardarella | 2011-07-30 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #2354 from waynn/patch-1 | Santiago Pastorino | 2011-07-29 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | remove redundant calls to stringify_keys | ||||
| * | | | | remove redundant calls to stringify_keys | Waynn Lue | 2011-07-29 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #2353 from bdurand/no_freeze_cache_entries | Aaron Patterson | 2011-07-29 | 2 | -22/+18 |
|\ \ \ \ | | | | | | | | | | | Change ActiveSupport::Cache behavior to not return frozen objects | ||||
| * | | | | Change ActiveSupport::Cache behavior to always return duplicate objects ↵ | Brian Durand | 2011-07-29 | 2 | -22/+18 |
| | |_|/ | |/| | | | | | | | | | | instead of frozen objects. | ||||
* | | | | delay backtrace scrubbing until we actually raise an exception. fixes #1936 | Aaron Patterson | 2011-07-29 | 1 | -7/+4 |
| | | | | |||||
* | | | | default writing the schema file as utf-8 | Aaron Patterson | 2011-07-29 | 1 | -1/+2 |
| | | | | |||||
* | | | | dump IO encoding value along with schema.rb so the file can be reloaded. ↵ | Aaron Patterson | 2011-07-29 | 2 | -3/+16 |
| | | | | | | | | | | | | | | | | fixes #1592 | ||||
* | | | | Merge pull request #2342 from ↵ | Santiago Pastorino | 2011-07-29 | 1 | -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 Cardarella | 2011-07-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | warnings because of a missing instance variable | ||||
* | | | | | Merge pull request #2344 from ↵ | Aaron Patterson | 2011-07-29 | 2 | -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 SafeBuffer | Brian Cardarella | 2011-07-29 | 2 | -0/+12 |
| |/ / / |