Permalink
Browse files

update some gems

  • Loading branch information...
1 parent 338389b commit f44b46f815f23548bc1eb4d906828f66e57c66ea @bdimcheff committed Feb 25, 2012
Showing with 55 additions and 58 deletions.
  1. +3 −3 Gemfile
  2. +52 −55 Gemfile.lock
View
@@ -1,10 +1,10 @@
require 'rbconfig'
HOST_OS = RbConfig::CONFIG['host_os']
source 'http://rubygems.org'
-gem 'rails', '3.1.2'
+gem 'rails', '~> 3.2'
group :assets do
- gem 'sass-rails', " ~> 3.1.0"
- gem 'coffee-rails', "~> 3.1.0"
+ gem 'sass-rails', " ~> 3.2.0"
+ gem 'coffee-rails', "~> 3.2.0"
gem 'uglifier'
gem "compass", "~> 0.12.alpha.0"
gem 'compass_twitter_bootstrap', :git => 'git://github.com/vwall/compass-twitter-bootstrap.git'
View
@@ -8,49 +8,48 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.2)
- actionpack (= 3.1.2)
- mail (~> 2.3.0)
- actionpack (3.1.2)
- activemodel (= 3.1.2)
- activesupport (= 3.1.2)
+ actionmailer (3.2.1)
+ actionpack (= 3.2.1)
+ mail (~> 2.4.0)
+ actionpack (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.5)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.0)
- activemodel (3.1.2)
- activesupport (= 3.1.2)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.1)
+ activesupport (= 3.2.1)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.2)
- activemodel (= 3.1.2)
- activesupport (= 3.1.2)
- arel (~> 2.2.1)
+ activerecord (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
+ arel (~> 3.0.0)
tzinfo (~> 0.3.29)
- activeresource (3.1.2)
- activemodel (= 3.1.2)
- activesupport (= 3.1.2)
- activesupport (3.1.2)
+ activeresource (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
+ activesupport (3.2.1)
+ i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.6)
archive-tar-minitar (0.5.2)
- arel (2.2.1)
+ arel (3.0.2)
bcrypt-ruby (3.0.1)
- bson (1.4.1)
+ bson (1.6.0)
bson_ext (1.4.1)
builder (3.0.0)
chunky_png (1.2.5)
- coffee-rails (3.1.1)
+ coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
- railties (~> 3.1.0)
+ railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.3)
+ coffee-script-source (1.2.0)
columnize (0.3.4)
compass (0.12.alpha.1)
chunky_png (~> 1.2)
@@ -92,61 +91,60 @@ GEM
railties (~> 3.0)
hike (1.2.1)
i18n (0.6.0)
+ journey (1.0.3)
jquery-rails (1.0.18)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.1)
+ json (1.6.5)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
loofah (1.2.0)
nokogiri (>= 1.4.4)
- mail (2.3.0)
+ mail (2.4.1)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
- mongo (1.4.1)
- bson (= 1.4.1)
- mongoid (2.3.3)
+ mongo (1.6.0)
+ bson (= 1.6.0)
+ mongoid (2.4.5)
activemodel (~> 3.1)
mongo (~> 1.3)
tzinfo (~> 0.3.22)
mongoid-rspec (1.4.4)
mongoid (~> 2.0)
rspec (~> 2)
- multi_json (1.0.3)
+ multi_json (1.0.4)
nokogiri (1.5.0)
orm_adapter (0.0.5)
polyglot (0.3.3)
- rack (1.3.5)
+ rack (1.4.1)
rack-cache (1.1)
rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.2)
- actionmailer (= 3.1.2)
- actionpack (= 3.1.2)
- activerecord (= 3.1.2)
- activeresource (= 3.1.2)
- activesupport (= 3.1.2)
+ rails (3.2.1)
+ actionmailer (= 3.2.1)
+ actionpack (= 3.2.1)
+ activerecord (= 3.2.1)
+ activeresource (= 3.2.1)
+ activesupport (= 3.2.1)
bundler (~> 1.0)
- railties (= 3.1.2)
+ railties (= 3.2.1)
rails-footnotes (3.7.5)
rails (>= 3.0.0)
- railties (3.1.2)
- actionpack (= 3.1.2)
- activesupport (= 3.1.2)
+ railties (3.2.1)
+ actionpack (= 3.2.1)
+ activesupport (= 3.2.1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
rb-fsevent (0.4.3.1)
- rdoc (3.11)
+ rdoc (3.12)
json (~> 1.4)
redcarpet (2.0.0b5)
rspec (2.7.0)
@@ -173,12 +171,11 @@ GEM
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
sass (3.1.10)
- sass-rails (3.1.5)
- actionpack (~> 3.1.0)
- railties (~> 3.1.0)
- sass (~> 3.1.10)
- tilt (~> 1.3.2)
- sprockets (2.1.1)
+ sass-rails (3.2.4)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
+ sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -203,7 +200,7 @@ PLATFORMS
DEPENDENCIES
bson_ext (>= 1.4.0)
- coffee-rails (~> 3.1.0)
+ coffee-rails (~> 3.2.0)
compass (~> 0.12.alpha.0)
compass_twitter_bootstrap!
database_cleaner (>= 0.6.7)
@@ -220,13 +217,13 @@ DEPENDENCIES
loofah
mongoid (>= 2.3.0)
mongoid-rspec (>= 1.4.4)
- rails (= 3.1.2)
+ rails (~> 3.2)
rails-footnotes (>= 3.7)
rb-fsevent
redcarpet (= 2.0.0b5)
rspec-rails (>= 2.6.1)
ruby-debug19
- sass-rails (~> 3.1.0)
+ sass-rails (~> 3.2.0)
tabs_on_rails
twitter_bootstrap_form_for
uglifier

0 comments on commit f44b46f

Please sign in to comment.