Commit Graph

24314 Commits

Author SHA1 Message Date
Aaron Patterson
19ab8e4bc9 fixing wrong words. thanks @jbrown 2011-08-04 14:07:39 -07:00
Santiago Pastorino
d7e55c3429 Merge pull request #2421 from pivotal-casebook/master
Simple_format should not edit it in place. (Fixes https://github.com/rails/rails/issues/1980)
2011-08-04 11:49:43 -07:00
Aaron Patterson
bf5b4c0055 adding my brain dump of the release process 2011-08-04 11:27:41 -07:00
Casebook Developer
f0034c75d5 ActionView::Helpers::TextHelper#simple_format should not change the text in place. Now it duplicates it. 2011-08-04 13:34:47 -04:00
Santiago Pastorino
cf96649bb7 Merge pull request #2356 from waynn/fix_symbol
fix stringify_keys destructive behavior for most FormTagHelper functions
2011-08-04 09:29:18 -07:00
Waynn Lue
54b83566cc fix stringify_keys destructive behavior for most FormTagHelper functions
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
2011-08-03 20:53:55 -07:00
Jon Leighton
f000d4e5fa Quote these dates to prevent intermittent test failure. Suppose local time 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. 2011-08-04 00:38:27 +01:00
Santiago Pastorino
7d4321711e Fix a bit precompile and lazy compile comments 2011-08-03 21:05:36 -03:00
Aaron Patterson
171881f610 make assert_difference error message not suck 2011-08-03 16:55:00 -07:00
Santiago Pastorino
cc9ed15785 Merge pull request #2413 from artemk/master
accept hash of options to recreate database for postgres adapter
2011-08-03 15:34:11 -07:00
Santiago Pastorino
bf5d1d4662 Don't require assets group in production by default, you can change this default in the application.rb anyways 2011-08-03 19:20:08 -03:00
artemk
b386951e42 accept option for recreate db for postgres (same as mysql now) 2011-08-04 00:34:13 +03:00
Santiago Pastorino
8962e96e39 This dep is already defined in activerecord.gemspec 2011-08-03 18:15:14 -03:00
Aaron Patterson
86b7d83f1c initializing @open_transactions in the initialize method 2011-08-03 08:57:52 -07:00
Aaron Patterson
3a29cc3412 add a migrate class method and delegate to the new instance 2011-08-02 20:01:38 -07:00
Christopher Meiklejohn
43fc814074 Ensure that .up and .down work as well. 2011-08-02 18:57:34 -07:00
Christopher Meiklejohn
74d7bfb200 Support backwards compatible interface for migration down/up with rails 3.0.x. 2011-08-02 18:55:59 -07:00
Aaron Patterson
3a4dc9d34c use File.directory? as Dir.exists? is only 1.9.2+ 2011-08-01 17:29:03 -07:00
Santiago Pastorino
6dda216715 Merge pull request #2324 from zenapsis/3-1-stable
Rails 3.1 throws a Errno::ENOTDIR if files are put in assets directories
2011-08-01 16:33:27 -03:00
Santiago Pastorino
6e701e8735 Merge pull request #2393 from bdurand/fix_cache_read_multi
Fix ArgumentError in ActiveSupport::Cache::CacheStore.read_multi
2011-08-01 10:58:48 -07:00
Brian Durand
fec4c5ad76 Pass options in ActiveSupport::Cache::CacheStore#read_multi through to the delete_entry call. 2011-08-01 12:05:29 -05:00
Santiago Pastorino
5c26f56b17 Merge pull request #2389 from dmitriy-kiriyenko/remove_unnecessary_require_in_delegation
Remove unnecessary require (happened after fcbde454f6)
2011-08-01 08:32:06 -07:00
Dmitriy Kiriyenko
6244a53a07 Remove unnecessary require (happened after fcbde454f6) 2011-08-01 18:00:41 +03:00
José Valim
6b3af028ac Merge pull request #2385 from bogdan/test_default_sanitizer2
MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer
2011-08-01 04:50:06 -07:00
thoefer
860202e8b2 Fix the issue where default_url_options is being cached on test cases. Closes #1872. Closes #2031.
Signed-off-by: José Valim <jose.valim@gmail.com>
2011-08-01 11:49:24 +02:00
José Valim
dc8773b19f Rename new method to_path to to_partial_path to avoid conflicts with File#to_path and similar. 2011-08-01 11:42:00 +02:00
Santiago Pastorino
d701b3fa47 Merge pull request #2379 from arunagw/extra_require_removal
Removing extra requires from the test. Already loaded in abstract_unit.
2011-07-31 11:50:52 -07:00
Santiago Pastorino
0fd7857841 Merge pull request #2377 from castlerock/remove_require
remove extra require for 'active_support/dependencies' as it is required
2011-07-31 11:49:22 -07:00
Arun Agrawal
ec7457ed2a Removing extra requires from the test. Already loaded in abstract_unit. 2011-07-31 23:36:21 +05:30
Vishnu Atrai
070513016f remove extra require for 'active_support/dependencies' as it is required in abstract_unit.rb 2011-07-31 23:12:28 +05:30
Santiago Pastorino
82061671dc Merge pull request #2370 from castlerock/remove_duplicate_require
remove extra require for 'stringio' as it is required in helper.rb
2011-07-31 09:51:43 -07:00
José Valim
3c4c281ed0 Merge pull request #2375 from vijaydev/rakeaboutfix
Fixes #2368. rake about not showing a few properties
2011-07-31 09:23:04 -07:00
Vijay Dev
040f65b091 fixes #2368. rake about not showing the middleware, db adapter and db schema version 2011-07-31 21:39:10 +05:30
Jon Leighton
e022c95eee Merge pull request #2371 from bradediger/issue-2346
remove_possible_method: test if method exists
2011-07-31 07:28:50 -07:00
Brad Ediger
7f88539087 remove_possible_method: test if method exists
This speeds up remove_possible_method substantially since it doesn't
have to rescue a NameError in the common case.

Closes #2346.
2011-07-31 08:51:48 -05:00
Vishnu Atrai
624c4571fd remove extra require for 'stringio' as it is required in helper.rb 2011-07-31 18:05:05 +05:30
José Valim
779d78d591 Merge pull request #2358 from arunagw/test_fix_187_skip
skiping magic comment test for < 1.9
2011-07-31 04:25:25 -07:00
Santiago Pastorino
853ca2e489 Merge pull request #2345 from castlerock/plugin_new_generator_more_default_file
Covering more files in test for plugin new generator.
2011-07-30 16:01:59 -07:00
Arun Agrawal
329409decd magic comment test only if encoding_aware?. 2011-07-30 23:46:26 +05:30
José Valim
4c85c4ed95 Merge pull request #2364 from bcardarella/resolve_undefined_instance_attributes_instance_variable
Resolve warnings by instantizing @attrubtes as nil
2011-07-30 09:11:19 -07:00
Brian Cardarella
e7330f3d4f Resolve warnings by instantizing @attrubtes as nil 2011-07-30 12:08:26 -04:00
Santiago Pastorino
2b925e8201 Merge pull request #2354 from waynn/patch-1
remove redundant calls to stringify_keys
2011-07-29 17:39:20 -07:00
Waynn Lue
1f270e80e6 remove redundant calls to stringify_keys 2011-07-29 17:07:27 -07:00
Aaron Patterson
ae1e70cf80 Merge pull request #2353 from bdurand/no_freeze_cache_entries
Change ActiveSupport::Cache behavior to not return frozen objects
2011-07-29 16:20:21 -07:00
Brian Durand
a263f37797 Change ActiveSupport::Cache behavior to always return duplicate objects instead of frozen objects. 2011-07-29 17:27:45 -05:00
Aaron Patterson
ea7f50863d delay backtrace scrubbing until we actually raise an exception. fixes #1936 2011-07-29 14:38:57 -07:00
Aaron Patterson
cea06a8e3f default writing the schema file as utf-8 2011-07-29 12:28:12 -07:00
Aaron Patterson
3d6e187255 dump IO encoding value along with schema.rb so the file can be reloaded. fixes #1592 2011-07-29 12:23:37 -07:00
Santiago Pastorino
455e9e748d Merge pull request #2342 from bcardarella/remove_controller_instance_variable_warnings_from_sprocket_helper_test
Resolve "instance variable @controller not initialized" warnings for sprocket_helper_test
2011-07-29 10:48:27 -07:00
Vishnu Atrai
6969638020 Covering more files in test for plugin new generator. 2011-07-29 23:05:40 +05:30