From 20b521576904072393bac046f8d387c0d84181c9 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Sun, 9 Apr 2017 17:52:37 +0300 Subject: [PATCH] use latest countries --- Gemfile | 3 +-- Gemfile.lock | 10 ++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index bbc463b1a..5f973598e 100644 --- a/Gemfile +++ b/Gemfile @@ -75,8 +75,7 @@ gem 'data_migrate', ref: '35d22b09ff37a4e9d61ab326ad5d8eb0edf1fc81' # country listing -#gem 'countries', '2.0.8' -gem 'countries', '1.2.5', :require => 'countries/global' +gem 'countries', :require => 'countries/global' # cloning activerecord objects gem 'deep_cloneable', '2.1.1' diff --git a/Gemfile.lock b/Gemfile.lock index f0899e38b..27375b23a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -159,12 +159,13 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.0.5) - countries (1.2.5) - currencies (~> 0.4.2) + countries (2.0.8) i18n_data (~> 0.7.0) + money (~> 6.7) + sixarm_ruby_unaccent (~> 1.1) + unicode_utils (~> 1.4) crack (0.4.3) safe_yaml (~> 1.0.0) - currencies (0.4.2) daemons (1.2.4) daemons-rails (1.2.1) daemons @@ -527,6 +528,7 @@ GEM unf_ext unf_ext (0.0.7.2) unicode-display_width (1.2.0) + unicode_utils (1.4.0) unicorn (5.3.0) kgio (~> 2.6) raindrops (~> 0.7) @@ -573,7 +575,7 @@ DEPENDENCIES capybara (= 2.4.4) coderay (= 1.1.0) coffee-rails (= 4.1.0) - countries (= 1.2.5) + countries daemons-rails (= 1.2.1) data_migrate! database_cleaner