Permalink
Browse files

update rails to 3.1.1, include sass & compass

  • Loading branch information...
1 parent 79d628f commit d704e31309054246902033b124d7fc75d678d07f @ivana committed Oct 13, 2011
Showing with 51 additions and 35 deletions.
  1. +2 −1 Gemfile
  2. +49 −34 Gemfile.lock
View
@@ -5,7 +5,8 @@ gem 'rails', '~> 3.1.0'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- # gem 'sass-rails', " ~> 3.1.0"
+ gem 'sass-rails', " ~> 3.1.0"
+ gem 'compass', '~> 0.12.alpha'
gem 'coffee-rails', "~> 3.1.0"
gem 'uglifier'
end
View
@@ -1,56 +1,61 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.0)
- actionpack (= 3.1.0)
+ actionmailer (3.1.1)
+ actionpack (= 3.1.1)
mail (~> 2.3.0)
- actionpack (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ actionpack (3.1.1)
+ activemodel (= 3.1.1)
+ activesupport (= 3.1.1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.2)
- rack-cache (~> 1.0.3)
+ rack-cache (~> 1.1)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.0)
- activemodel (3.1.0)
- activesupport (= 3.1.0)
- bcrypt-ruby (~> 3.0.0)
+ sprockets (~> 2.0.2)
+ activemodel (3.1.1)
+ activesupport (= 3.1.1)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ activerecord (3.1.1)
+ activemodel (= 3.1.1)
+ activesupport (= 3.1.1)
arel (~> 2.2.1)
tzinfo (~> 0.3.29)
- activeresource (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
- activesupport (3.1.0)
+ activeresource (3.1.1)
+ activemodel (= 3.1.1)
+ activesupport (= 3.1.1)
+ activesupport (3.1.1)
multi_json (~> 1.0)
arel (2.2.1)
- bcrypt-ruby (3.0.1)
builder (3.0.0)
choices (0.2.4)
hashie (>= 0.4.0)
+ chunky_png (1.2.5)
coffee-rails (3.1.1)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.1.2)
+ compass (0.12.alpha.0)
+ chunky_png (~> 1.2)
+ fssm (>= 0.2.7)
+ sass (~> 3.1)
erubis (2.7.0)
execjs (1.2.9)
multi_json (~> 1.0)
+ fssm (0.2.7)
hashie (1.1.0)
hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.14)
+ jquery-rails (1.0.16)
railties (~> 3.0)
thor (~> 0.14)
+ json (1.6.1)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -60,33 +65,41 @@ GEM
oauth (0.4.5)
pg (0.11.0)
polyglot (0.3.2)
- rack (1.3.3)
- rack-cache (1.0.3)
+ rack (1.3.4)
+ 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.0)
- actionmailer (= 3.1.0)
- actionpack (= 3.1.0)
- activerecord (= 3.1.0)
- activeresource (= 3.1.0)
- activesupport (= 3.1.0)
+ rails (3.1.1)
+ actionmailer (= 3.1.1)
+ actionpack (= 3.1.1)
+ activerecord (= 3.1.1)
+ activeresource (= 3.1.1)
+ activesupport (= 3.1.1)
bundler (~> 1.0)
- railties (= 3.1.0)
- railties (3.1.0)
- actionpack (= 3.1.0)
- activesupport (= 3.1.0)
+ railties (= 3.1.1)
+ railties (3.1.1)
+ actionpack (= 3.1.1)
+ activesupport (= 3.1.1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2)
- rdoc (3.9.4)
- sprockets (2.0.0)
+ rdoc (3.10)
+ json (~> 1.4)
+ sass (3.1.10)
+ sass-rails (3.1.4)
+ actionpack (~> 3.1.0)
+ railties (~> 3.1.0)
+ sass (>= 3.1.4)
+ sprockets (~> 2.0.0)
+ tilt (~> 1.3.2)
+ sprockets (2.0.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -103,7 +116,7 @@ GEM
hashie (>= 0.2.2)
oauth (~> 0.4.2)
yajl-ruby (>= 0.7.7)
- tzinfo (0.3.29)
+ tzinfo (0.3.30)
uglifier (1.0.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
@@ -115,9 +128,11 @@ PLATFORMS
DEPENDENCIES
choices
coffee-rails (~> 3.1.0)
+ compass (~> 0.12.alpha)
jquery-rails
pg
rails (~> 3.1.0)
+ sass-rails (~> 3.1.0)
sqlite3-ruby
therubyracer-heroku (~> 0.8.1.pre3)
twitter-login (~> 0.4.2)

0 comments on commit d704e31

Please sign in to comment.