Upgrade to paperclip 3.x

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 11587ec3fee993914c8367003d83562067577e2e..5a601d6b7adebb7d1083b0d16c277df3d13efbd7 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -24,9 +24,6 @@ gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .js.coffee assets and views
 gem 'coffee-rails', '~> 4.0.0'
 
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
-
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 
@@ -49,7 +46,7 @@ gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
 gem 'composite_primary_keys', '>= 6.0.0'
 gem 'http_accept_language', '~> 1.0.2'
-gem 'paperclip', '~> 2.0'
+gem 'paperclip', '~> 3.0'
 gem 'deadlock_retry', '>= 1.2.0'
 gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.2', :require => 'i18n-js'
 gem 'rack-cors'
@@ -77,8 +74,9 @@ gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_1
 # Load httpclient for SOAP support for Quova GeoIP queries
 gem 'httpclient'
 
-# Load memcache in case we are using it
-gem 'memcached', '>= 1.4.1'
+# Load memcache client in case we are using it
+gem 'dalli'
+gem 'kgio'
 
 # Gems useful for development
 group :development do