Use reverse geocoders for any lat/lon queries

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index f4ad7c7fa0166b0c2fac195125a9bf91b95e1152..1521ea0e66dd7f9c5305eefc714a27b817299e17 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,9 @@ gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19
 # Require things which have moved to gems in ruby 2.0
 gem 'psych', :platforms => :ruby_20
 
 # Require things which have moved to gems in ruby 2.0
 gem 'psych', :platforms => :ruby_20
 

+# Require json for multi_json
+gem 'json'
+

 # Use postgres as the database
 gem 'pg'
 
 # Use postgres as the database
 gem 'pg'
 


@@ -21,9 +24,6 @@ gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .js.coffee assets and views
 gem 'coffee-rails', '~> 4.0.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'
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 


@@ -38,15 +38,15 @@ gem 'r2'
 gem 'ejs'
 
 # Load rails plugins
 gem 'ejs'
 
 # Load rails plugins

-gem 'rails-i18n', ">= 0.6.3"
+gem 'rails-i18n', "~> 4.0.0"

 gem 'dynamic_form'
 gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 gem 'dynamic_form'
 gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'

-gem 'openstreetmap-oauth-plugin', '>= 0.4.1.1', :require => 'oauth-plugin'
+gem 'oauth-plugin', '>= 0.5.1'

 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
 gem 'composite_primary_keys', '>= 6.0.0'
 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 'http_accept_language', '~> 2.0.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'
 gem 'deadlock_retry', '>= 1.2.0'
 gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.2', :require => 'i18n-js'
 gem 'rack-cors'


@@ -74,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 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
 
 # Gems useful for development
 group :development do