Update Potlatch 2 to 2.3-648-g9cab056 build

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index f4ad7c7fa0166b0c2fac195125a9bf91b95e1152..fd8e46b9facaac318003176b766082ba5d739bd8 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'

 
 # Require rails
 
 # Require rails

-gem 'rails', '4.0.0'
+gem 'rails', '4.1.6'

 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19
 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19


@@ -9,11 +9,14 @@ 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 SCSS for stylesheets
 # Use postgres as the database
 gem 'pg'
 
 # Use SCSS for stylesheets

-gem 'sass-rails', '~> 4.0.0'
+gem 'sass-rails', '~> 4.0.3'

 
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'


@@ -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'
 


@@ -34,21 +34,21 @@ gem 'jsonify-rails'
 # Use R2 for RTL conversion
 gem 'r2'
 
 # Use R2 for RTL conversion
 gem 'r2'
 

-# Use ejs for javascript templates
-gem 'ejs'
+# Use autoprefixer to generate CSS prefixes
+gem 'autoprefixer-rails'

 
 # Load rails plugins
 
 # 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 '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 'composite_primary_keys', '~> 7.0.11'
+gem 'http_accept_language', '~> 2.0.0'
+gem 'paperclip', '~> 4.0'

 gem 'deadlock_retry', '>= 1.2.0'
 gem 'deadlock_retry', '>= 1.2.0'

-gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.2', :require => 'i18n-js'
+gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.3', :require => 'i18n-js'

 gem 'rack-cors'
 gem 'actionpack-page_caching'
 
 gem 'rack-cors'
 gem 'actionpack-page_caching'
 


@@ -71,11 +71,13 @@ gem 'htmlentities'
 # Load SystemTimer for implementing request timeouts
 gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18
 
 # Load SystemTimer for implementing request timeouts
 gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18
 

-# Load httpclient for SOAP support for Quova GeoIP queries
+# Load httpclient and soap4r for SOAP support for Quova GeoIP queries

 gem 'httpclient'
 gem 'httpclient'

+gem 'soap4r-ruby1.9'

 
 

-# 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


@@ -85,5 +87,11 @@ end
 # Gems needed for running tests
 group :test do
   gem 'timecop'
 # Gems needed for running tests
 group :test do
   gem 'timecop'

-  gem 'minitest', '~> 4.7.0', :platforms => [:ruby_19, :ruby_20]
+  gem 'minitest', '~> 5.1', :platforms => [:ruby_19, :ruby_20]
+end
+
+# Needed in development as well so rake can see konacha tasks
+group :development, :test do
+  gem 'konacha'
+  gem 'poltergeist'

 end
 end