aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile10
1 files changed, 6 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 21d6612ce..67ad2b0a5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,8 @@ 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 'net-http-local'
@@ -34,6 +35,7 @@ gem 'rmagick', :require => 'RMagick'
gem 'ruby-msg', '~> 1.5.0'
gem "statistics2", "~> 0.54"
gem 'syslog_protocol'
+gem 'thin'
gem 'vpim'
gem 'will_paginate'
# when 1.2.9 is released by the maintainer, we can stop using this fork:
@@ -45,12 +47,12 @@ 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 'unidecode'
+gem 'unidecoder'
group :assets do
gem 'bootstrap-sass'