From c92185ccb581cd54f78707969ae5e45ca5b9e6d0 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Sun, 9 Apr 2017 16:59:46 +0300 Subject: [PATCH] move back to 1.x countries --- Gemfile | 3 ++- Gemfile.lock | 12 +++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 28549ba7c..7a02ebb7a 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,8 @@ gem 'data_migrate', ref: '35d22b09ff37a4e9d61ab326ad5d8eb0edf1fc81' # country listing -gem 'countries', '2.0.8' +#gem 'countries', '2.0.8' +gem 'countries', '1.2.5' # cloning activerecord objects gem 'deep_cloneable', '2.1.1' diff --git a/Gemfile.lock b/Gemfile.lock index d31e03a11..f0899e38b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,7 +56,7 @@ GIT GIT remote: https://github.com/tarmotalu/digidoc_client.git revision: 1645e83a5a548addce383f75703b0275c5310c32 - ref: 1645e83a5a548addce383f75703b0275c5310c32 + branch: master specs: digidoc_client (0.3.0) crack (>= 0.1.8) @@ -159,13 +159,12 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.0.5) - countries (2.0.8) + countries (1.2.5) + currencies (~> 0.4.2) 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 @@ -528,7 +527,6 @@ 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) @@ -575,7 +573,7 @@ DEPENDENCIES capybara (= 2.4.4) coderay (= 1.1.0) coffee-rails (= 4.1.0) - countries (= 2.0.8) + countries (= 1.2.5) daemons-rails (= 1.2.1) data_migrate! database_cleaner