diff --git a/Gemfile b/Gemfile index 8d2fe6c9f..1b9c7659c 100644 --- a/Gemfile +++ b/Gemfile @@ -59,7 +59,7 @@ gem 'fastercsv', '1.5.4', :require => false gem 'mini_magick', '3.4' gem 'rest-client', '1.6.7' -gem 'jammit', '0.6.5' +gem 'jammit-s3' # JSON and API @@ -81,7 +81,7 @@ gem 'ruby-oembed' # queue gem 'resque', '1.19.0' -gem 'resque-ensure-connected' +gem 'resque-ensure-connected', :git => 'https://github.com/socialcast/resque-ensure-connected.git' gem 'resque-timeout', '1.0.0' gem 'SystemTimer', '1.2.3', :platforms => :ruby_18 diff --git a/Gemfile.lock b/Gemfile.lock index cc41fb22b..982ad1e04 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,6 +31,14 @@ GIT oauth2 (= 0.5.0) sinatra +GIT + remote: https://github.com/socialcast/resque-ensure-connected.git + revision: 8ac0f9e4658495097fb333a93db81d54ba9a5311 + specs: + resque-ensure-connected (0.2.0) + activerecord (>= 2.3.5) + resque (>= 1.10.0) + GEM remote: http://rubygems.org/ specs: @@ -197,6 +205,10 @@ GEM railties (~> 3.0) jammit (0.6.5) yui-compressor (>= 0.9.3) + jammit-s3 (0.6.0.2) + jammit (>= 0.5.4) + mimemagic (>= 0.1.7) + s3 (>= 0.3.7) jasmine (1.1.2) jasmine-core (>= 1.1.0) rack (>= 1.1) @@ -221,6 +233,7 @@ GEM treetop (~> 1.4.8) messagebus_ruby_api (1.0.3) mime-types (1.17.2) + mimemagic (0.1.8) mini_magick (3.4) subexec (~> 0.2.1) mobile-fu (1.0.0) @@ -273,6 +286,7 @@ GEM parallel pg (0.12.2) polyglot (0.3.3) + proxies (0.2.1) rack (1.2.5) rack-google-analytics (0.10.0) rack-mobile-detect (0.3.0) @@ -314,9 +328,6 @@ GEM redis-namespace (~> 1.0.2) sinatra (>= 0.9.2) vegas (~> 0.1.2) - resque-ensure-connected (0.2.0) - activerecord (>= 2.3.5) - resque (>= 1.10.0) resque-timeout (1.0.0) resque (~> 1.0) rest-client (1.6.7) @@ -357,6 +368,8 @@ GEM ruby_core_source (0.1.5) archive-tar-minitar (>= 0.5.2) rubyzip (0.9.5) + s3 (0.3.11) + proxies (~> 0.2.0) sass (3.1.12) selenium-webdriver (2.16.0) childprocess (>= 0.2.5) @@ -447,7 +460,7 @@ DEPENDENCIES heroku_san http_accept_language (~> 1.0.2) i18n-inflector-rails (~> 1.0) - jammit (= 0.6.5) + jammit-s3 jasmine (~> 1.1.2) json jwt @@ -474,7 +487,7 @@ DEPENDENCIES rails-i18n redcarpet (= 2.0.1) resque (= 1.19.0) - resque-ensure-connected + resque-ensure-connected! resque-timeout (= 1.0.0) rest-client (= 1.6.7) roxml!