diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-03-10 18:19:01 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-14 12:46:24 -0300 |
| commit | ff8e9e07b445a020faa4adf8e94b6d9328f2f1de (patch) | |
| tree | 4535cb04302bb0a9962430b4d25e83722fe3e7ef /railties/lib/rails/generators.rb | |
| parent | 2b355757d5485beb42a4184e28621d86daced862 (diff) | |
| download | rails-ff8e9e07b445a020faa4adf8e94b6d9328f2f1de.tar.gz rails-ff8e9e07b445a020faa4adf8e94b6d9328f2f1de.tar.bz2 rails-ff8e9e07b445a020faa4adf8e94b6d9328f2f1de.zip | |
Allow generator configs from http_only! to be overriden by app
[Carlos Antonio da Silva & Santiago Pastorino]
Diffstat (limited to 'railties/lib/rails/generators.rb')
| -rw-r--r-- | railties/lib/rails/generators.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index f70c9ebab9..8d66cd2fd3 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -61,6 +61,7 @@ module Rails } def self.configure!(config) #:nodoc: + http_only! if config.http_only? no_color! unless config.colorize_logging aliases.deep_merge! config.aliases options.deep_merge! config.options @@ -68,7 +69,6 @@ module Rails templates_path.concat config.templates templates_path.uniq! hide_namespaces(*config.hidden_namespaces) - http_only! if config.http_only? end def self.templates_path |