aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile21
1 files changed, 15 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 9545f1ae1..7e33a5f12 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,8 @@ if File.exist? "/etc/debian_version" and File.open("/etc/debian_version").read.s
end
source 'https://rubygems.org'
-gem 'rails', '3.1.12'
+gem 'rails', '3.2.16'
+
gem 'pg'
# New gem releases aren't being done. master is newer and supports Rails > 3.0
@@ -17,9 +18,11 @@ gem 'charlock_holmes'
gem 'dynamic_form'
gem 'exception_notification'
gem 'fastercsv', '>=1.5.5'
-gem 'jquery-rails', '~> 2.1'
+gem 'jquery-rails', '~> 3.0.4'
+gem 'jquery-ui-rails'
gem 'json'
gem 'mahoro'
+gem 'memcache-client'
gem 'net-http-local', :platforms => [:ruby_18, :ruby_19]
gem 'net-purge'
gem 'newrelic_rpm'
@@ -45,13 +48,21 @@ gem 'zip'
gem 'fast_gettext'
gem 'gettext_i18n_rails'
gem 'gettext'
-# Use until this PR is merged: https://github.com/svenfuchs/globalize3/pull/191
-gem 'globalize3', :git => 'git://github.com/henare/globalize3.git', :branch => 'not-null-empty-attributes'
+gem 'globalize3', :git => 'git://github.com/globalize/globalize.git', :ref => '5fd95f2389dff1'
gem 'locale'
gem 'routing-filter'
gem 'unicode'
gem 'unidecoder'
+group :assets do
+ gem 'bootstrap-sass'
+ gem 'sass-rails', '~> 3.2.3'
+ gem 'compass-rails'
+ gem 'coffee-rails', "~> 3.2.1"
+ gem 'uglifier', '>= 1.0.3'
+ gem 'therubyracer'
+end
+
group :test do
gem 'fakeweb'
gem 'coveralls', :require => false
@@ -67,8 +78,6 @@ group :develop do
gem 'ruby-debug', :platforms => :ruby_18
gem 'debugger', :platforms => :ruby_19
gem 'byebug', :platforms => :ruby_20
- gem 'bootstrap-sass'
- gem 'compass'
gem 'annotate'
end