Skip to content

Commit

Permalink
Upgrade rails, coffee-rails, sass-rails and sass. Fixes issue #545.
Browse files Browse the repository at this point in the history
  • Loading branch information
carols10cents committed Aug 13, 2012
1 parent fcb2238 commit 8001f7b
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 58 deletions.
9 changes: 4 additions & 5 deletions Gemfile
@@ -1,15 +1,14 @@
source 'http://rubygems.org'

gem 'rails', '3.1.6'
gem 'rails', '3.2.8'

# Gems used only for assets and not required
# in production environments by default.
group :assets do
# Lock sass-rails at 3.1.4 because of an issue in sass-rails 3.1.5 & 6
# https://github.com/rails/sass-rails/issues/78
gem 'sass-rails', "= 3.1.4"
gem "sass", "~> 3.1.10"
gem 'sass-rails', "~> 3.2.5"
gem 'compass-rails', "~> 1.0.3"
gem 'coffee-rails', "~> 3.1.0"
gem 'coffee-rails', "~> 3.2.2"
gem 'uglifier', "~> 1.0.0"
end

Expand Down
103 changes: 50 additions & 53 deletions Gemfile.lock
Expand Up @@ -66,39 +66,38 @@ GEM
remote: http://rubygems.org/
specs:
aaronh-chronic (0.3.9)
actionmailer (3.1.6)
actionpack (= 3.1.6)
mail (~> 2.3.3)
actionpack (3.1.6)
activemodel (= 3.1.6)
activesupport (= 3.1.6)
actionmailer (3.2.8)
actionpack (= 3.2.8)
mail (~> 2.4.4)
actionpack (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.6)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.4)
activemodel (3.1.6)
activesupport (= 3.1.6)
sprockets (~> 2.1.3)
activemodel (3.2.8)
activesupport (= 3.2.8)
builder (~> 3.0.0)
i18n (~> 0.6)
activerecord (3.1.6)
activemodel (= 3.1.6)
activesupport (= 3.1.6)
arel (~> 2.2.3)
activerecord (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.1.6)
activemodel (= 3.1.6)
activesupport (= 3.1.6)
activesupport (3.1.6)
multi_json (>= 1.0, < 1.3)
activeresource (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
activesupport (3.2.8)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.6)
airbrake (3.0.9)
activesupport
builder
arel (2.2.3)
arel (3.0.2)
bcrypt-ruby (3.0.0)
bson (1.6.2)
bson_ext (1.6.2)
Expand All @@ -114,13 +113,13 @@ GEM
childprocess (0.3.4)
ffi (~> 1.0, >= 1.0.6)
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.2)
coffee-script-source (1.3.3)
compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
Expand Down Expand Up @@ -155,6 +154,7 @@ GEM
hashie (1.1.0)
hike (1.2.1)
i18n (0.6.0)
journey (1.0.4)
jquery-rails (1.0.12)
railties (~> 3.0)
thor (~> 0.14)
Expand All @@ -165,7 +165,7 @@ GEM
libwebsocket (0.1.4)
addressable
libxml-ruby (2.3.3)
mail (2.3.3)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
Expand Down Expand Up @@ -206,33 +206,31 @@ GEM
pyu-ruby-sasl (0.0.3.3)
quiet_assets (1.0.0)
rails (~> 3.1)
rack (1.3.6)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-openid (1.3.1)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
rails (3.1.6)
actionmailer (= 3.1.6)
actionpack (= 3.1.6)
activerecord (= 3.1.6)
activeresource (= 3.1.6)
activesupport (= 3.1.6)
rails (3.2.8)
actionmailer (= 3.2.8)
actionpack (= 3.2.8)
activerecord (= 3.2.8)
activeresource (= 3.2.8)
activesupport (= 3.2.8)
bundler (~> 1.0)
railties (= 3.1.6)
railties (3.1.6)
actionpack (= 3.1.6)
activesupport (= 3.1.6)
railties (= 3.2.8)
railties (3.2.8)
actionpack (= 3.2.8)
activesupport (= 3.2.8)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
thor (>= 0.14.6, < 2.0)
raindrops (0.7.0)
rake (0.9.2.2)
ratom (0.7.1)
Expand All @@ -254,13 +252,11 @@ GEM
ruby-openid (>= 2.1.7)
rubyntlm (0.1.1)
rubyzip (0.9.9)
sass (3.1.7)
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)
sass (3.1.21)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
selenium-webdriver (2.25.0)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
Expand All @@ -272,11 +268,11 @@ GEM
simplecov (0.4.2)
simplecov-html (~> 0.4.4)
simplecov-html (0.4.5)
sprockets (2.0.4)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thor (0.14.6)
thor (0.15.4)
tilt (1.3.3)
treetop (1.4.10)
polyglot
Expand Down Expand Up @@ -315,7 +311,7 @@ DEPENDENCIES
bson (= 1.6.2)
bson_ext (= 1.6.2)
capybara (~> 1.1.2)
coffee-rails (~> 3.1.0)
coffee-rails (~> 3.2.2)
compass-rails (~> 1.0.3)
database_cleaner (~> 0.6.7)
delayed_job!
Expand All @@ -340,12 +336,13 @@ DEPENDENCIES
pony (~> 1.3)
pygmentize (~> 0.0.3)
quiet_assets (~> 1.0.0)
rails (= 3.1.6)
rails (= 3.2.8)
rdiscount (~> 1.6.8)
redfinger (~> 0.1.0)
rocco!
rsa (~> 0.1.4)
sass-rails (= 3.1.4)
sass (~> 3.1.10)
sass-rails (~> 3.2.5)
show_me_the_cookies (~> 1.1.0)
simplecov (~> 0.4.0)
twitter (~> 1.6.2)
Expand Down

0 comments on commit 8001f7b

Please sign in to comment.