diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-11-18 19:13:00 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-11-18 19:13:00 +0000 |
| commit | 68fc88b88298199190b6bfd4f8d97ab2d2fb62a2 (patch) | |
| tree | 09c32813ec5d661f7e468932c4441afdd9acae52 | |
| parent | 78077aa71d26c7f9c57527218cc2f5f652eb3461 (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).
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -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) |