Permalink
Browse files

Updated rails and simple_worker gem.

  • Loading branch information...
treeder committed Nov 14, 2011
1 parent 48c141c commit 1d9e907c7f68aee383c4789ebc13d9b5c89c8282
Showing with 12 additions and 9 deletions.
  1. +2 −1 Gemfile
  2. +10 −8 Gemfile.lock
View
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '~>3.1'
+gem 'rails', '~> 3.1.0'
gem 'mysql2', '>= 0.3'
@@ -14,6 +14,7 @@ gem 'bson_ext', '~> 1.3'
# todo: get this working: gem 'cancan'
gem 'client_side_validations'
gem 'compass'
+gem 'concerned_with'
gem 'dalli'
gem 'delayed_job'
gem 'devise'
View
@@ -43,15 +43,16 @@ GEM
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
+ concerned_with (0.1.0)
daemons (1.1.4)
dalli (1.1.3)
delayed_job (2.1.4)
activesupport (~> 3.0)
daemons
- devise (1.4.9)
+ devise (1.5.0)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
- warden (~> 1.0.3)
+ warden (~> 1.1)
erubis (2.7.0)
eventmachine (0.12.10)
fssm (0.2.7)
@@ -64,7 +65,7 @@ GEM
hashie (1.2.0)
hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.16)
+ jquery-rails (1.0.17)
railties (~> 3.0)
thor (~> 0.14)
json (1.6.1)
@@ -77,7 +78,7 @@ GEM
hashie
rest-client
multi_json (1.0.3)
- mysql2 (0.3.7)
+ mysql2 (0.3.10)
open4 (1.2.0)
orm_adapter (0.0.5)
polyglot (0.3.3)
@@ -114,7 +115,7 @@ GEM
rest-client (1.6.7)
mime-types (>= 1.16)
sass (3.1.10)
- simple_worker (2.0.2)
+ simple_worker (2.0.3)
rest-client
rest-client
typhoeus
@@ -124,7 +125,7 @@ GEM
sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
+ tilt (!= 1.3.0, ~> 1.1)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
@@ -133,7 +134,7 @@ GEM
typhoeus (0.3.2)
mime-types
tzinfo (0.3.31)
- warden (1.0.6)
+ warden (1.1.0)
rack (>= 1.0)
zip (2.0.2)
@@ -145,6 +146,7 @@ DEPENDENCIES
bson_ext (~> 1.3)
client_side_validations
compass
+ concerned_with
dalli
delayed_job
devise
@@ -154,6 +156,6 @@ DEPENDENCIES
jquery-rails
mini_fb
mysql2 (>= 0.3)
- rails (~> 3.1)
+ rails (~> 3.1.0)
rest-client
simple_worker (>= 2)

0 comments on commit 1d9e907

Please sign in to comment.