rails/config/application.rb in whowish_word-0.3.1 vs rails/config/application.rb in whowish_word-0.3.2

- old
+ new

@@ -1,30 +1,30 @@ -$ORM_ENGINE = :active_record -#$ORM_ENGINE = :mongoid - -require File.expand_path('../boot', __FILE__) - -# Pick the frameworks you want: - -require "active_record/railtie" -require "action_controller/railtie" -require "action_mailer/railtie" -require "active_resource/railtie" -#require "rails/test_unit/railtie" - - - -# If you have a Gemfile, require the gems listed there, including any gems -# you've limited to :test, :development, or :production. -Bundler.require(:default, $ORM_ENGINE, Rails.env) if defined?(Bundler) - -module WhowishWordRails - - class Application < Rails::Application - - config.encoding = "utf-8" - config.filter_parameters += [:password] - config.active_support.deprecation = :stderr - - end - -end +$ORM_ENGINE = :active_record +#$ORM_ENGINE = :mongoid + +require File.expand_path('../boot', __FILE__) + +# Pick the frameworks you want: + +require "active_record/railtie" +require "action_controller/railtie" +require "action_mailer/railtie" +require "active_resource/railtie" +#require "rails/test_unit/railtie" + + + +# If you have a Gemfile, require the gems listed there, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(:default, $ORM_ENGINE, Rails.env) if defined?(Bundler) + +module WhowishWordRails + + class Application < Rails::Application + + config.encoding = "utf-8" + config.filter_parameters += [:password] + config.active_support.deprecation = :stderr + + end + +end