Update gems but stay on rails 3.1 for now

This commit is contained in:
Christophe Vilayphiou 2012-01-24 13:07:40 +08:00
parent 8ce796b667
commit b8243df5b5
2 changed files with 63 additions and 62 deletions

29
Gemfile
View File

@ -1,29 +1,23 @@
source 'http://rubygems.org'
gem 'rails','>=3.1.0'
gem 'yajl-ruby', :require => 'yajl'
gem 'rails', '>=3.1.0', '<3.2.0'
gem 'bson_ext'
gem 'carrierwave'
gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
gem 'ckeditor'
gem 'devise'
gem 'exception_notification' # Send error trace
gem 'execjs'
gem 'jquery-rails'
gem 'mini_magick'
gem 'mongoid'
gem 'radius'
gem 'rake'
gem 'ruby-debug19'
gem 'rubyzip'
gem 'sinatra'
gem 'execjs'
gem 'mongoid'
gem 'rake','0.8.7'
gem 'jquery-rails'
gem 'sprockets'
gem 'radius'
gem 'exception_notification'
# For linux
# gem 'therubyracer'
# gem 'therubyracer' # For linux
# Gems used only for assets and not required
# in production environments by default.
@ -33,9 +27,6 @@ group :assets do
gem 'uglifier'
end
# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
# gem 'ruby-debug'
gem 'ruby-debug19'
group :test, :development do
gem 'spork'
@ -44,7 +35,7 @@ group :test, :development do
gem "rspec-rails", "~> 2.0"
gem "factory_girl_rails"
gem "shoulda-matchers"
gem "rcov"
gem "simplecov"
gem "delorean"
gem "watchr"
gem "spork"

View File

@ -52,12 +52,12 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.1.3)
columnize (0.3.5)
database_cleaner (0.7.0)
delorean (1.1.1)
coffee-script-source (1.2.0)
columnize (0.3.6)
database_cleaner (0.7.1)
delorean (1.2.0)
chronic
devise (1.5.2)
devise (1.5.3)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
warden (~> 1.1)
@ -65,19 +65,19 @@ GEM
erubis (2.7.0)
exception_notification (2.5.2)
actionmailer (>= 3.0.4)
execjs (1.2.9)
execjs (1.3.0)
multi_json (~> 1.0)
factory_girl (2.3.2)
factory_girl (2.5.0)
activesupport
factory_girl_rails (1.4.0)
factory_girl (~> 2.3.0)
factory_girl_rails (1.6.0)
factory_girl (~> 2.5.0)
railties (>= 3.0.0)
hike (1.2.1)
i18n (0.6.0)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
json (1.6.3)
json (1.6.5)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
mail (2.3.0)
@ -85,23 +85,23 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
mini_magick (3.3)
subexec (~> 0.1.0)
mini_magick (3.4)
subexec (~> 0.2.1)
mongo (1.5.2)
bson (= 1.5.2)
mongoid (2.4.0)
mongoid (2.4.2)
activemodel (~> 3.1)
mongo (~> 1.3)
tzinfo (~> 0.3.22)
multi_json (1.0.4)
orm_adapter (0.0.5)
orm_adapter (0.0.6)
polyglot (0.3.3)
rack (1.3.6)
rack-cache (1.1)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-protection (1.1.4)
rack-protection (1.2.0)
rack
rack-ssl (1.3.2)
rack
@ -123,23 +123,22 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.8.7)
rcov (0.9.11)
rdoc (3.11)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
rspec (2.7.0)
rspec-core (~> 2.7.0)
rspec-expectations (~> 2.7.0)
rspec-mocks (~> 2.7.0)
rspec-core (2.7.1)
rspec-expectations (2.7.0)
rspec (2.8.0)
rspec-core (~> 2.8.0)
rspec-expectations (~> 2.8.0)
rspec-mocks (~> 2.8.0)
rspec-core (2.8.0)
rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.7.0)
rspec-rails (2.7.0)
actionpack (~> 3.0)
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.7.0)
rspec-mocks (2.8.0)
rspec-rails (2.8.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.8.0)
ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
@ -151,37 +150,49 @@ GEM
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
rubyzip (0.9.5)
sass (3.1.11)
sass (3.1.12)
sass-rails (3.1.5)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass (~> 3.1.10)
tilt (~> 1.3.2)
shoulda-matchers (1.0.0)
sinatra (1.3.1)
rack (~> 1.3, >= 1.3.4)
rack-protection (~> 1.1, >= 1.1.2)
simplecov (0.5.4)
multi_json (~> 1.0.3)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
sinatra (1.3.2)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
spork (0.8.5)
spork (0.9.0)
spork (0.9.0-x86-mingw32)
win32-process
sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
subexec (0.1.0)
subexec (0.2.1)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.31)
uglifier (1.1.0)
uglifier (1.2.2)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
warden (1.1.0)
rack (>= 1.0)
watchr (0.7)
yajl-ruby (1.1.0)
yajl-ruby (1.1.0-x86-mingw32)
win32-api (1.4.8-x86-mingw32)
win32-process (0.6.5)
windows-pr (>= 1.1.2)
windows-api (0.4.0)
win32-api (>= 1.4.5)
windows-pr (1.2.1)
win32-api (>= 1.4.5)
windows-api (>= 0.3.0)
PLATFORMS
ruby
@ -203,18 +214,17 @@ DEPENDENCIES
mini_magick
mongoid
radius
rails (>= 3.1.0)
rake (= 0.8.7)
rcov
rails (>= 3.1.0, < 3.2.0)
rake
rspec (~> 2.0)
rspec-rails (~> 2.0)
ruby-debug19
rubyzip
sass-rails
shoulda-matchers
simplecov
sinatra
spork
sprockets
uglifier
watchr
yajl-ruby