diff options
| author | Xavier Shay <xavier@rhnh.net> | 2010-11-28 10:42:43 +1100 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-11-27 22:05:35 -0200 |
| commit | 76053fe4d12bd2be38e16b3322f9de73e09b43bc (patch) | |
| tree | 650474c922c14a30f48c5f63e5a7630f4e731a96 /railties/lib | |
| parent | 927c582acfb9253be493e7ec584c0503555e00fb (diff) | |
| download | rails-76053fe4d12bd2be38e16b3322f9de73e09b43bc.tar.gz rails-76053fe4d12bd2be38e16b3322f9de73e09b43bc.tar.bz2 rails-76053fe4d12bd2be38e16b3322f9de73e09b43bc.zip | |
Allow http templates again, fix the broken test
[#5926 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index a560888edd..2d0c10efca 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -102,7 +102,7 @@ module Rails def set_default_accessors! self.rails_template = case options[:template] - when /^https:\/\// + when /^https?:\/\// options[:template] when String File.expand_path(options[:template], Dir.pwd) |