X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0e9e6e6f8f15e6dbdd208cd741386562e2aceee8..965fb0b3ae7c89ae46d606147811674d646b6acb:/Gemfile

diff --git a/Gemfile b/Gemfile
index c1ca5fa35..cca9853f9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # Require rails
-gem 'rails', '4.0.0'
+gem 'rails', '4.1.4'
 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19
@@ -16,7 +16,7 @@ gem 'json'
 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'
@@ -34,21 +34,21 @@ gem 'jsonify-rails'
 # 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
-gem 'rails-i18n', ">= 0.6.3"
+gem 'rails-i18n', "~> 4.0.0"
 gem 'dynamic_form'
 gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 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 'composite_primary_keys', '~> 7.0.3'
 gem 'http_accept_language', '~> 2.0.0'
-gem 'paperclip', '~> 3.0'
+gem 'paperclip', '~> 4.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'
 
@@ -71,8 +71,9 @@ gem 'htmlentities'
 # 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 'soap4r-ruby1.9'
 
 # Load memcache client in case we are using it
 gem 'dalli'
@@ -86,5 +87,11 @@ end
 # 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