developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert to mongoid 2.0.0 and remove reroute_middleware

This commit is contained in:
chris 2011-04-13 16:39:46 +08:00 committed by ihower
parent 106db069fd
commit 6db9727829
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Gemfile
View File

@ -6,13 +6,8 @@ gem 'bson_ext'
gem 'carrierwave' gem 'carrierwave'
gem 'devise' gem 'devise'
gem 'mini_magick' gem 'mini_magick'
<<<<<<< HEAD
gem 'mongoid'
# gem 'rblog', :path => 'lib/rblog' # gem 'rblog', :path => 'lib/rblog'
======= gem 'mongoid', '2.0.0'
gem 'mongoid', '2.0.1'
>>>>>>> 7bdfe52... update radius, modify routes to handle modules, add blog module
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git' # gem 'rails', :git => 'git://github.com/rails/rails.git'

10
Gemfile.lock
View File

@ -31,7 +31,7 @@ GEM
arel (2.0.9) arel (2.0.9)
bcrypt-ruby (2.1.4) bcrypt-ruby (2.1.4)
bson (1.3.0) bson (1.3.0)
bson_ext (1.2.0) bson_ext (1.2.4)
builder (2.1.2) builder (2.1.2)
carrierwave (0.5.3) carrierwave (0.5.3)
activesupport (~> 3.0) activesupport (~> 3.0)
@ -52,9 +52,9 @@ GEM
subexec (~> 0.0.4) subexec (~> 0.0.4)
mongo (1.3.0) mongo (1.3.0)
bson (>= 1.3.0) bson (>= 1.3.0)
mongoid (2.0.1) mongoid (2.0.0)
activemodel (~> 3.0) activemodel (~> 3.0)
mongo (~> 1.3) mongo (~> 1.2)
tzinfo (~> 0.3.22) tzinfo (~> 0.3.22)
will_paginate (~> 3.0.pre) will_paginate (~> 3.0.pre)
orm_adapter (0.0.4) orm_adapter (0.0.4)
@ -82,7 +82,7 @@ GEM
thor (0.14.6) thor (0.14.6)
treetop (1.4.9) treetop (1.4.9)
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.25) tzinfo (0.3.26)
warden (1.0.3) warden (1.0.3)
rack (>= 1.0.0) rack (>= 1.0.0)
will_paginate (3.0.pre2) will_paginate (3.0.pre2)
@ -95,5 +95,5 @@ DEPENDENCIES
carrierwave carrierwave
devise devise
mini_magick mini_magick
mongoid (= 2.0.1) mongoid (= 2.0.0)
rails (= 3.0.3) rails (= 3.0.3)

3
config/application.rb
View File

@ -6,7 +6,6 @@ require "action_controller/railtie"
require "action_mailer/railtie" require "action_mailer/railtie"
require "active_resource/railtie" require "active_resource/railtie"
require "rails/test_unit/railtie" require "rails/test_unit/railtie"
require File.expand_path('lib/reroute_middleware')
# If you have a Gemfile, require the gems listed there, including any gems # If you have a Gemfile, require the gems listed there, including any gems
# you've limited to :test, :development, or :production. # you've limited to :test, :development, or :production.
@ -15,8 +14,6 @@ Bundler.require(:default, Rails.env) if defined?(Bundler)
module PrototypeR4 module PrototypeR4
class Application < Rails::Application class Application < Rails::Application
config.middleware.use RerouteMiddleware
config.paths.vendor.plugins.instance_variable_set("@paths", config.paths.vendor.plugins.instance_variable_get("@paths") + ["#{config.root}/vendor/built_in_modules"]) config.paths.vendor.plugins.instance_variable_set("@paths", config.paths.vendor.plugins.instance_variable_get("@paths") + ["#{config.root}/vendor/built_in_modules"])
config.paths.vendor.plugins.instance_variable_set("@paths", config.paths.vendor.plugins.instance_variable_get("@paths") + ["#{config.root}/vendor/downloaded_modules"]) config.paths.vendor.plugins.instance_variable_set("@paths", config.paths.vendor.plugins.instance_variable_get("@paths") + ["#{config.root}/vendor/downloaded_modules"])
config.paths.vendor.plugins.instance_variable_set("@paths", config.paths.vendor.plugins.instance_variable_get("@paths") + ["#{config.root}/vendor/radius"]) config.paths.vendor.plugins.instance_variable_set("@paths", config.paths.vendor.plugins.instance_variable_get("@paths") + ["#{config.root}/vendor/radius"])