diff options
| -rw-r--r-- | railties/Rakefile | 2 | ||||
| -rw-r--r-- | railties/environments/environment.rb | 25 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/rails.rb | 2 |
4 files changed, 27 insertions, 4 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index 3befcff3e9..dc04b0bd9b 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -26,7 +26,7 @@ RUBY_FORGE_USER = "webster132" # end -BASE_DIRS = %w( app config/environments config/tasks components db doc log lib public script script/process test vendor ) +BASE_DIRS = %w( app config/environments components db doc log lib lib/tasks public script script/process test vendor ) APP_DIRS = %w( apis models controllers helpers views views/layouts ) PUBLIC_DIRS = %w( images javascripts stylesheets ) TEST_DIRS = %w( fixtures unit functional mocks mocks/development mocks/test ) diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb index 69951abee6..fc66d4ae44 100644 --- a/railties/environments/environment.rb +++ b/railties/environments/environment.rb @@ -1,9 +1,32 @@ # Be sure to restart your webserver when you modify this file. + +# Uncomment below to force Rails into production mode +# (Use only when you can't set environment variables through your web/app server) +# ENV['RAILS_ENV'] = 'production' + # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') Rails::Initializer.run do |config| - # See Rails::Configuration for options + # Skip frameworks you're not going to use + # config.frameworks -= [ :action_web_service, :action_mailer ] + + # Add additional load paths for your own custom dirs + # config.load_paths += %W( #{RAILS_ROOT}/app/services #{RAILS_ROOT}/app/services ) + + # Force all environments to use the same logger level + # config.log_level = Logger::DEBUG + + # See Rails::Configuration for more options end +# Add new inflection rules using the following format +# (all these examples are active by default): +# Inflector.inflections do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + # Include your application configuration below
\ No newline at end of file diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index eee37be5c1..aef333c13a 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -107,11 +107,11 @@ class AppGenerator < Rails::Generator::Base app/models app/views/layouts config/environments - config/tasks components db doc lib + lib/tasks log public/images public/javascripts diff --git a/railties/lib/tasks/rails.rb b/railties/lib/tasks/rails.rb index 28e4d8af80..de545cf10e 100644 --- a/railties/lib/tasks/rails.rb +++ b/railties/lib/tasks/rails.rb @@ -4,4 +4,4 @@ $VERBOSE = nil Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext } # Load any custom rakefile extensions -Dir["./config/tasks/**/*.rake"].each { |ext| load ext }
\ No newline at end of file +Dir["./lib/tasks/**/*.rake"].each { |ext| load ext }
\ No newline at end of file |