From: nomeu Date: Wed, 2 Jan 2013 10:08:22 +0000 (+0900) Subject: update rails 3.1.1 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4593f3344575fbd02a9300b6e70f1359edf85228;p=tdcgexplorer%2Fnimono.git update rails 3.1.1 --- diff --git a/config/database.yml.rails2 b/config/database.yml.rails2 deleted file mode 100644 index 1a75bdc..0000000 --- a/config/database.yml.rails2 +++ /dev/null @@ -1,51 +0,0 @@ -# PostgreSQL. Versions 7.4 and 8.x are supported. -# -# Install the ruby-postgres driver: -# gem install ruby-postgres -# On Mac OS X: -# gem install ruby-postgres -- --include=/usr/local/pgsql -# On Windows: -# gem install ruby-postgres -# Choose the win32 build. -# Install PostgreSQL and put its /bin directory on your path. -development: - adapter: postgresql - encoding: unicode - database: nimono_development - pool: 5 - username: nimono - password: - - # Connect on a TCP socket. Omitted by default since the client uses a - # domain socket that doesn't need configuration. Windows does not have - # domain sockets, so uncomment these lines. - #host: localhost - #port: 5432 - - # Schema search path. The server defaults to $user,public - #schema_search_path: myapp,sharedapp,public - - # Minimum log levels, in increasing order: - # debug5, debug4, debug3, debug2, debug1, - # log, notice, warning, error, fatal, and panic - # The server defaults to notice. - #min_messages: warning - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - adapter: postgresql - encoding: unicode - database: nimono_test - pool: 5 - username: nimono - password: - -production: - adapter: postgresql - encoding: unicode - database: nimono_production - pool: 5 - username: nimono - password: diff --git a/config/environment.rb.rails2 b/config/environment.rb.rails2 deleted file mode 100644 index 554590c..0000000 --- a/config/environment.rb.rails2 +++ /dev/null @@ -1,44 +0,0 @@ -# Be sure to restart your server when you modify this file - -# Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION - -# Bootstrap the Rails environment, frameworks, and default configuration -require File.join(File.dirname(__FILE__), 'boot') - -Rails::Initializer.run do |config| - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - - # Add additional load paths for your own custom dirs - # config.load_paths += %W( #{RAILS_ROOT}/extras ) - - # Specify gems that this application depends on and have them installed with rake gems:install - config.gem "will_paginate", :lib => "will_paginate" - config.gem "locale" - config.gem "locale_rails", :version => "2.0.5" - config.gem "gettext" - config.gem "gettext_activerecord", :version => "2.1.0" - config.gem "gettext_rails", :version => "2.1.0" - - # Only load the plugins named here, in the order given (default is alphabetical). - # :all can be used as a placeholder for all plugins not explicitly named - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - - # Skip frameworks you're not going to use. To use Rails without a database, - # you must remove the Active Record framework. - config.frameworks -= [ :active_resource, :action_mailer ] - - # Activate observers that should always be running - # config.active_record.observers = :cacher, :garbage_collector, :forum_observer - config.active_record.colorize_logging = false - - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. - # Run "rake -D time" for a list of tasks for finding time zone names. - config.time_zone = 'UTC' - - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')] - # config.i18n.default_locale = :de -end diff --git a/config/environments/development.rb b/config/environments/development.rb index 2c94cd7..c95993a 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -10,8 +10,6 @@ Nimono::Application.configure do config.whiny_nils = true # Show full error reports and disable caching - config.action_controller.consider_all_requests_local = true - config.action_view.debug_rjs = true config.action_controller.perform_caching = false # Don't care if the mailer can't send diff --git a/config/environments/development.rb.rails2 b/config/environments/development.rb.rails2 deleted file mode 100644 index 85c9a60..0000000 --- a/config/environments/development.rb.rails2 +++ /dev/null @@ -1,17 +0,0 @@ -# Settings specified here will take precedence over those in config/environment.rb - -# In the development environment your application's code is reloaded on -# every request. This slows down response time but is perfect for development -# since you don't have to restart the webserver when you make code changes. -config.cache_classes = false - -# Log error messages when you accidentally call methods on nil. -config.whiny_nils = true - -# Show full error reports and disable caching -config.action_controller.consider_all_requests_local = true -config.action_view.debug_rjs = true -config.action_controller.perform_caching = false - -# Don't care if the mailer can't send -config.action_mailer.raise_delivery_errors = false \ No newline at end of file diff --git a/config/environments/production.rb b/config/environments/production.rb index e8f2b0d..4a4721b 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -6,7 +6,6 @@ Nimono::Application.configure do config.cache_classes = true # Full error reports are disabled and caching is turned on - config.aconsider_all_requests_local = false config.action_controller.perform_caching = true # Specifies the header that your server uses for sending files diff --git a/config/environments/production.rb.rails2 b/config/environments/production.rb.rails2 deleted file mode 100644 index 27119d2..0000000 --- a/config/environments/production.rb.rails2 +++ /dev/null @@ -1,28 +0,0 @@ -# Settings specified here will take precedence over those in config/environment.rb - -# The production environment is meant for finished, "live" apps. -# Code is not reloaded between requests -config.cache_classes = true - -# Full error reports are disabled and caching is turned on -config.action_controller.consider_all_requests_local = false -config.action_controller.perform_caching = true -config.action_view.cache_template_loading = true - -# See everything in the log (default is :info) -# config.log_level = :debug - -# Use a different logger for distributed setups -# config.logger = SyslogLogger.new - -# Use a different cache store in production -# config.cache_store = :mem_cache_store - -# Enable serving of images, stylesheets, and javascripts from an asset server -# config.action_controller.asset_host = "http://assets.example.com" - -# Disable delivery errors, bad email addresses will be ignored -# config.action_mailer.raise_delivery_errors = false - -# Enable threaded mode -# config.threadsafe! \ No newline at end of file diff --git a/config/environments/test.rb b/config/environments/test.rb index 7740043..d89540e 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -11,7 +11,6 @@ Nimono::Application.configure do config.whiny_nils = true # Show full error reports and disable caching - config.consider_all_requests_local = true config.action_controller.perform_caching = false # Raise exceptions instead of rendering exception templates diff --git a/config/routes.rb.rails2 b/config/routes.rb.rails2 deleted file mode 100644 index aedf823..0000000 --- a/config/routes.rb.rails2 +++ /dev/null @@ -1,57 +0,0 @@ -ActionController::Routing::Routes.draw do |map| - map.resources :thumbs - - map.resources :xes - - map.resources :vmds - - map.resources :pmds - - map.resources :arcs - - map.resources :locations - - map.resource :session - - # The priority is based upon order of creation: first created -> highest priority. - - # Sample of regular route: - # map.connect 'products/:id', :controller => 'catalog', :action => 'view' - # Keep in mind you can assign values other than :controller and :action - - # Sample of named route: - # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase' - # This route can be invoked with purchase_url(:id => product.id) - - # Sample resource route (maps HTTP verbs to controller actions automatically): - # map.resources :products - - # Sample resource route with options: - # map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get } - - # Sample resource route with sub-resources: - # map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller - - # Sample resource route with more complex sub-resources - # map.resources :products do |products| - # products.resources :comments - # products.resources :sales, :collection => { :recent => :get } - # end - - # Sample resource route within a namespace: - # map.namespace :admin do |admin| - # # Directs /admin/products/* to Admin::ProductsController (app/controllers/admin/products_controller.rb) - # admin.resources :products - # end - - # You can have the root of your site routed with map.root -- just remember to delete public/index.html. - map.root :controller => "welcome" - - # See how all your routes lay out with "rake routes" - - # Install the default routes as the lowest priority. - # Note: These default routes make all actions in every controller accessible via GET requests. You should - # consider removing or commenting them out if you're using named routes and resources. - map.connect ':controller/:action/:id' - map.connect ':controller/:action/:id.:format' -end