aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock6
2 files changed, 5 insertions, 5 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'
diff --git a/Gemfile.lock b/Gemfile.lock
index 339aa358d..989920a72 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
GIT
- remote: git://github.com/henare/globalize3.git
- revision: 2931f559cbed8843ab7d16278d70ce99a0239132
- branch: not-null-empty-attributes
+ remote: git://github.com/globalize/globalize.git
+ revision: 5fd95f2389dff13c9368fb2e08c96c8a48798c72
+ ref: 5fd95f2389dff1
specs:
globalize3 (0.3.0)
activemodel (>= 3.0.0)