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

Merge branch 'master' of https://github.com/Rulingcom/orbit

This commit is contained in:
chris2tof 2011-06-14 15:20:58 +08:00
parent 96a43f023e 7215b56f7e
commit 842dc9ee7a
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -2,7 +2,6 @@ source 'http://rubygems.org'
gem 'rails', '3.0.6' gem 'rails', '3.0.6'
gem 'yajl-ruby', :require => 'yajl' gem 'yajl-ruby', :require => 'yajl'
gem 'nokogiri'
gem 'bson_ext' gem 'bson_ext'
gem 'carrierwave' gem 'carrierwave'

6
Gemfile.lock
View File

@ -29,7 +29,7 @@ GEM
activesupport (= 3.0.6) activesupport (= 3.0.6)
activesupport (3.0.6) activesupport (3.0.6)
arel (2.0.10) arel (2.0.10)
bcrypt-ruby (2.1.4) bcrypt-ruby (2.1.4-x86-mingw32)
bson (1.3.1) bson (1.3.1)
bson_ext (1.3.1) bson_ext (1.3.1)
builder (2.1.2) builder (2.1.2)
@ -67,7 +67,6 @@ GEM
mongo (~> 1.2) mongo (~> 1.2)
tzinfo (~> 0.3.22) tzinfo (~> 0.3.22)
will_paginate (~> 3.0.pre) will_paginate (~> 3.0.pre)
nokogiri (1.4.4)
orm_adapter (0.0.5) orm_adapter (0.0.5)
polyglot (0.3.1) polyglot (0.3.1)
rack (1.2.3) rack (1.2.3)
@ -116,7 +115,7 @@ GEM
yajl-ruby (0.8.2) yajl-ruby (0.8.2)
PLATFORMS PLATFORMS
ruby x86-mingw32
DEPENDENCIES DEPENDENCIES
bson_ext bson_ext
@ -127,7 +126,6 @@ DEPENDENCIES
factory_girl_rails factory_girl_rails
mini_magick mini_magick
mongoid (= 2.0.0) mongoid (= 2.0.0)
nokogiri
rails (= 3.0.6) rails (= 3.0.6)
rake (= 0.8.7) rake (= 0.8.7)
rcov rcov

2
config/environment.rb
View File

@ -1,5 +1,7 @@
# Load the rails application # Load the rails application
require File.expand_path('../application', __FILE__) require File.expand_path('../application', __FILE__)
require 'yaml'
YAML::ENGINE.yamler = 'syck'
# Initialize the rails application # Initialize the rails application
PrototypeR4::Application.initialize! PrototypeR4::Application.initialize!