Restore attribution on main map

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 787a0864008fe0710c41e3307d5b85298309210c..76071aa2e7d48f00585d20277fa7a20596de237b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,10 @@ source 'http://rubygems.org'
 gem 'rails', '3.2.12'
 
 # Require things which have moved to gems in ruby 1.9
-gem 'bigdecimal', :platforms => :ruby_19
+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 the postgres database driver
 gem 'pg'
@@ -29,6 +32,7 @@ gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'
 gem 'i18n-js', '>= 3.0.0.rc2'
 gem 'rack-cors'
+gem 'jsonify-rails'
 
 # We need ruby-openid 2.2.0 or later for ruby 1.9 support
 gem 'ruby-openid', '>= 2.2.0'
@@ -55,10 +59,15 @@ gem 'httpclient'
 # Load memcache in case we are using it
 gem 'memcached', '>= 1.4.1'
 
+# Gems useful for development
+group :development do
+  gem 'vendorer'
+end
+
 # Gems needed for running tests
 group :test do
   gem 'timecop'
-  gem 'minitest', :platforms => :ruby_19
+  gem 'minitest', '~> 4.7.0', :platforms => [:ruby_19, :ruby_20]
 end
 
 # Gems needed for compiling assets