Commit Graph

24288 Commits

Author SHA1 Message Date
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
Aaron Patterson
3e8fe1d898 Merge pull request #2344 from bcardarella/resolve_warning_for_capture_helper_test
Reset @dirty to false when slicing an instance of SafeBuffer
2011-07-29 10:32:24 -07:00
José Valim
bbe1b1afce Merge pull request #2343 from arunagw/test_add_for_plugin_new_gen
Test add for plugin new generator generate mailer
2011-07-29 10:11:43 -07:00
Brian Cardarella
6ef1079e0e Reset @dirty to false when slicing an instance of SafeBuffer 2011-07-29 13:10:31 -04:00
Arun Agrawal
4fe2c99052 Test add for plugin new generator generate mailer 2011-07-29 22:06:36 +05:30
Brian Cardarella
1c94ba0332 Instead of removing the instance variable just set it to nil, resolves the warnings because of a missing instance variable 2011-07-29 12:08:35 -04:00
José Valim
270fa63e9b Merge pull request #2339 from dgeb/mailers-in-plugins
Ensure that app/mailers gets created in new plugins (#2287 brought into master)
2011-07-29 07:21:16 -07:00
Dan Gebhardt
d8e62a93e3 Include empty app/mailers directory in mountable and full plugins 2011-07-29 08:15:44 -04:00
Santiago Pastorino
54463592cb Tidy up 2011-07-28 16:56:57 -03:00
José Valim
caacf85673 Merge pull request #2327 from cesario/patch-1
We don't need to require erb here.
2011-07-28 11:24:08 -07:00
José Valim
b295ea1362 Merge pull request #2330 from thedarkone/resources-router-fix
Inline resources router fix
2011-07-28 11:10:23 -07:00
thedarkone
a5f57a7ef2 Make use of the inherited initializer. 2011-07-28 20:02:21 +02:00
thedarkone
4d4d2179f6 There is no need to be destructive with the passed-in options.
This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations.
2011-07-28 20:00:48 +02:00
Xavier Noria
adce9b4ca3 Merge pull request #2329 from nertzy/master
Give attribution to Peter Jaros for the patch we paired on
2011-07-28 10:12:51 -07:00
Grant Hutchins
b407034c9d Give attribution to Peter Jaros for the patch we paired on. 2011-07-28 13:38:28 -03:00
Santiago Pastorino
84763047a0 Merge pull request #2326 from castlerock/plugin_generator_fix
pluging generator test fix
2011-07-28 08:47:04 -07:00
Franck Verrot
ad0772f268 We don't need to require erb here. 2011-07-28 18:45:43 +03:00
Vishnu Atrai
5a4e8f5514 pluging generator test fix 2011-07-28 21:14:29 +05:30
Santiago Pastorino
d10f268d20 Tidy up a bit plugin new gemspec 2011-07-28 11:48:21 -03:00
Santiago Pastorino
5ab9132c19 Merge pull request #2295 from dgeb/mo-better-plugins
Improve dependency management and gemspec file for plugins
2011-07-28 07:44:10 -07:00
Dan Gebhardt
a74e4736f9 Moved dependencies from Gemfile to gemspec to eliminate redundant declarations. 2011-07-28 09:58:27 -04:00
Dan Gebhardt
d9b59c341c Extracted version from gemspec and placed it in its own file. This is consistent with the approach taken by "bundle gem", and is expected by gems such as svenfuchs/gem-release which can be used to bump / tag versions of gems. 2011-07-28 09:47:21 -04:00
Dan Gebhardt
5515a18aa5 Expanded meta-data in gemspec to include author, email, etc.; Defaults include "TODO" to prevent gems from being built without review. 2011-07-28 09:46:13 -04:00
Jon Leighton
971a74b81f Revert "Merge pull request #2309 from smasry/master"
This reverts commit 9d396ee8195e31f646e0b89158ed96f4db4ab38f, reversing
changes made to fa2bfd832c1d1e997d93c2269a485cc74782c86d.

Reason: the change broke the build.
2011-07-28 13:14:11 +01:00
José Valim
30dae273c8 Update CHANGELOG. 2011-07-28 10:05:17 +02:00
José Valim
d5eeacc95f Move the cache to a nested hash which performs better than a hash with array as keys. 2011-07-28 10:01:55 +02:00