Merge pull request #611 from opf/fix/globalize

Uses globalize from rubygems.

Gemfile

@@ -35,8 +35,7 @@ gem "rubytree", "~> 0.8.3"
 gem "rdoc", ">= 2.4.2"
 # Needed only on RUBY_VERSION = 1.8, ruby 1.9+ compatible interpreters should bring their csv
 gem "fastercsv", "~> 1.5.0", :platforms => [:ruby_18, :jruby, :mingw_18]
-# master includes the uniqueness validator, formerly patched in config/initializers/globalize3_patch.rb
-gem 'globalize3', :git => 'https://github.com/globalize/globalize.git', :branch => '3-0-stable'
+gem 'globalize'
 
 gem 'request_store'
 

Gemfile.lock

@@ -6,16 +6,6 @@ GIT
     i18n-js (3.0.0.rc5)
       i18n
 
-GIT
-  remote: https://github.com/globalize/globalize.git
-  revision: 6ad3de9f257a27ece3e026fce36c8cf8a410a4f7
-  branch: 3-0-stable
-  specs:
-    globalize3 (0.3.0)
-      activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
-      paper_trail (~> 2)
-
 GIT
   remote: https://github.com/rails/prototype_legacy_helper.git
   revision: a2cd95c3e3c1a4f7a9566efdab5ce59c886cb05f
@@ -135,6 +125,10 @@ GEM
     formatador (0.2.4)
     gherkin (2.12.2)
       multi_json (~> 1.3)
+    globalize (3.0.0)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      paper_trail (~> 2)
     guard (2.2.2)
       formatador (>= 0.2.4)
       listen (~> 2.1)
@@ -373,7 +367,7 @@ DEPENDENCIES
   factory_girl_rails (~> 4.0)
   faker
   fastercsv (~> 1.5.0)
-  globalize3!
+  globalize
   guard-cucumber
   guard-rspec
   guard-test