Commit Graph

11486 Commits

Author SHA1 Message Date
Jeremy Kemper
a66449d852 Ruby 1.9.2: work around inherited hook being called before yielding to block 2009-11-09 14:36:49 -08:00
Jeremy Kemper
7a68554291 Merge commit 'fxn/master' 2009-11-09 13:56:49 -08:00
Jeremy Kemper
d5fd09246e Bump AP gem dependencies to upgrade Rack to 1.0.1 and to include rack-mount and erubis. 2009-11-09 13:29:15 -08:00
Xavier Noria
a48f49e56b the REXML security fix is not needed for Ruby >= 1.8.7 2009-11-09 22:16:51 +01:00
Xavier Noria
db2c0d79e3 Enumerable#none? is not needed for Ruby >= 1.8.7 2009-11-09 22:16:51 +01:00
Xavier Noria
329e7f4441 Integer#even? and Integer#odd? are not needed for Ruby >= 1.8.7 2009-11-09 22:16:51 +01:00
Xavier Noria
b6598c683b String#each_char is not needed for Ruby >= 1.8.7 2009-11-09 22:16:51 +01:00
Xavier Noria
c0bb4c6ed2 String#start_with? and String#end_with? are not needed for Ruby >= 1.8.7, leaves their plural aliases though 2009-11-09 22:16:51 +01:00
Xavier Noria
004db18cb0 String#bytesize is not needed for Ruby >= 1.8.7 2009-11-09 22:16:51 +01:00
Xavier Noria
f8e713f488 Object#tap is not needed for Ruby >= 1.8.7 2009-11-09 22:16:51 +01:00
Xavier Noria
1979e9c855 Symbol#to_proc is not needed for Ruby >= 1.8.7 2009-11-09 22:16:51 +01:00
Xavier Noria
d4513ac699 Object#instance_variable_defined? is not needed for Ruby >= 1.8.7 2009-11-09 22:16:51 +01:00
Bryan Helmkamp
047007fa9d Silence warning: discarding old h 2009-11-09 15:44:36 -05:00
Jeremy Kemper
3b0b6dfc86 Merge branch 'master' of github.com:rails/rails 2009-11-09 12:00:08 -08:00
Jeremy Kemper
c74cddc919 Merge commit 'brynary/fix-master-warnings' 2009-11-09 11:58:57 -08:00
Bryan Helmkamp
17dee01b6f Fix Ruby warning: method redefined; discarding old breakpoint 2009-11-09 14:49:12 -05:00
Bryan Helmkamp
afc129e270 Fix some Ruby warnings: `*' interpreted as argument prefix 2009-11-09 14:46:29 -05:00
Yehuda Katz
0f1da1cb5c Revert "Bundle I18n 0.2.0."
This reverts commit 83f329f5f30567a10bc96410da230bf986db8ad4.
2009-11-09 11:33:47 -08:00
José Valim
4a1f438781 Change mailer subjects lookup. 2009-11-09 10:57:53 -08:00
José Valim
83f329f5f3 Bundle I18n 0.2.0. 2009-11-09 10:57:53 -08:00
Yehuda Katz
790c062280 Merge branch 'master' of github.com:rails/rails 2009-11-09 10:57:20 -08:00
Jeremy Kemper
3039912886 Silence spurious warning 2009-11-09 05:09:04 -08:00
Jeremy Kemper
76b2d3e337 Ruby 1.9.2: URI.parse and .decode are deprecated 2009-11-09 05:07:58 -08:00
Jeremy Kemper
6d808cf494 Remove reliance on string access core extension 2009-11-09 04:59:26 -08:00
Jeremy Kemper
7f0fcadd36 Revert "Ruby 1.9.2: avoid Array#to_s and Array(nil)"
This reverts commit 7ad461b44dabb586fbad190493ac4ecd96104597.
2009-11-09 04:05:22 -08:00
Jeremy Kemper
a038b3d1bc Make Rakefile usable outside of base dir 2009-11-09 03:31:59 -08:00
Jeremy Kemper
ee0d41c38d Remove string access core extension dependency 2009-11-09 03:18:54 -08:00
Jeremy Kemper
b1164adda1 Fix arg destructure 2009-11-08 23:29:33 -08:00
Jeremy Kemper
8e32830412 Fix unresolved string extension dependencies 2009-11-08 22:49:31 -08:00
Jeremy Kemper
deddd55086 Work around assert_raise limitation 2009-11-08 22:02:57 -08:00
Jeremy Kemper
20cdaddfd2 Ruby 1.9.2: work around changes to flatten and nil.to_str 2009-11-08 22:02:57 -08:00
Jeremy Kemper
7ad461b44d Ruby 1.9.2: avoid Array#to_s and Array(nil) 2009-11-08 22:02:49 -08:00
Jeremy Kemper
c44fb4ced5 Ruby 1.9: use method_name to work around miniunit API changes 2009-11-08 21:30:34 -08:00
José Valim
51fe6d05e7 Refactor generators a little bit.
Signed-off-by: Yehuda Katz <wycats@mobile-166-129-219-135.mycingular.net>
2009-11-08 18:41:44 -08:00
José Valim
216e8c6bfa Update Rails Generators to use Thor 0.12.0.
Signed-off-by: Yehuda Katz <wycats@mobile-166-129-219-135.mycingular.net>
2009-11-08 18:41:44 -08:00
Joshua Peek
c10f4ae01d Merge remote branch 'Fingertips/master' 2009-11-08 16:03:15 -06:00
Jeremy Kemper
a595abff21 Unknown :format param should result in empty request.formats 2009-11-08 12:12:58 -08:00
Yehuda Katz
103b29831e Since we require 1.8.7 we don't need to shim instance_exec anymore 2009-11-07 11:23:34 -08:00
Yehuda Katz
e1b5e3cc70 Break up inflector to reduce the dependency burden on dependency-les methods like constantize. 2009-11-07 11:23:21 -08:00
Eloy Duran
f125a34501 Define autosave association callbacks when using accepts_nested_attributes_for.
This way we don't define all the validation methods for all associations by
default, but only when needed.

[#3355 state:resolved]
2009-11-07 00:42:42 +01:00
Chris Hapgood
c2cfb20198 Share ActionView::TestCase's output_buffer with view for concat support.
[#3467 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
2009-11-07 00:42:07 +01:00
Chris Hapgood
b43964d606 Make some assertions in the ActionView::TestCase tests actually do something.
[#3468 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
2009-11-07 00:39:39 +01:00
Nathan Weizenbaum
cbded53671 When rendering layouts with blocks, use #capture to avoid assuming that the return value is the block's content.
Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
2009-11-05 20:08:04 -08:00
Jeremy Kemper
cb9a1759c0 Fix generators tests that expect a class name 2009-11-05 16:12:02 -08:00
Jeremy Kemper
1c047be0fc If class doesn't have a name, there's no implied layout name, so don't set up a _layout method 2009-11-05 16:12:02 -08:00
Jeremy Kemper
60911c3933 Ruby 1.9: Rack apps must *always* take an env arg on 1.9 2009-11-05 16:12:02 -08:00
Jeremy Kemper
73a36b599a Shush 2009-11-05 16:12:02 -08:00
Yehuda Katz
b12f194c39 Update AC::Middleware to play better with the normal AC::Metal stack. This required stopping to use #call for non-rack-related stuff 2009-11-05 15:38:25 -08:00
Yehuda Katz
b0dfd1d19b Update Ruby version check to 1.8.7 2009-11-05 15:38:25 -08:00
Yehuda Katz + Carl Lerche
4369426993 Add the ability to merge initializers from various objects in order. 2009-11-05 14:45:53 -08:00