aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-11-18 19:13:00 +0000
committerLouise Crow <louise.crow@gmail.com>2013-11-18 19:13:00 +0000
commit68fc88b88298199190b6bfd4f8d97ab2d2fb62a2 (patch)
tree09c32813ec5d661f7e468932c4441afdd9acae52 /Gemfile
parent78077aa71d26c7f9c57527218cc2f5f652eb3461 (diff)
Update globalize3 repo.
This is the commit where @henares' pull request was merged. This is a quick fix, but I think we want to see if we can use the globalize 3.0.1 gem with minimal fixes. It causes tests to fail at the moment, I think because we still have translated attributes in our public_bodies table (and not null constraints at the databse level on at least the name attribute).
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 5467eaa4d..186251de4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,8 +45,8 @@ 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'