From 3d16656e177455820f1faa6fc9da2d5acf704e67 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Sun, 9 Apr 2017 15:53:48 +0300 Subject: [PATCH] update money-rails, countries and digidoc_client --- Gemfile | 6 +++--- Gemfile.lock | 34 +++++++++++++++++++--------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index 3c5aef8f4..f4dbae4c5 100644 --- a/Gemfile +++ b/Gemfile @@ -66,7 +66,7 @@ gem 'jbuilder', '2.2.16' # json api # registry specfic gem 'simpleidn', '0.0.7' # For punycode gem 'isikukood' # for EE-id validation -gem 'money-rails', '1.4.1' +gem 'money-rails', '1.8.0' # deploy gem 'whenever', '0.9.4', require: false @@ -75,13 +75,13 @@ gem 'data_migrate', ref: '35d22b09ff37a4e9d61ab326ad5d8eb0edf1fc81' # country listing -gem 'countries', '0.11.4' +gem 'countries', '2.0.8' # cloning activerecord objects gem 'deep_cloneable', '2.1.1' # id + mid login -gem 'digidoc_client', '0.2.1' +gem 'digidoc_client', '0.3.0' gem 'epp', '1.5.0', github: 'internetee/epp' gem 'epp-xml', '1.1.0', github: 'internetee/epp-xml' diff --git a/Gemfile.lock b/Gemfile.lock index a9879fc01..5e761d7f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,12 +147,13 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.0.5) - countries (0.11.4) - 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 @@ -170,7 +171,7 @@ GEM thread_safe (~> 0.1) warden (~> 1.2.3) diff-lcs (1.3) - digidoc_client (0.2.1) + digidoc_client (0.3.0) crack (>= 0.1.8) httpclient (>= 2.3.4) mime-types (>= 1.16) @@ -260,7 +261,7 @@ GEM httpi (2.4.2) rack socksify - i18n (0.7.0) + i18n (0.8.1) i18n_data (0.7.0) ice_nine (0.11.2) isikukood (0.1.2) @@ -305,14 +306,15 @@ GEM rake mini_portile2 (2.1.0) minitest (5.10.1) - monetize (1.1.0) - money (~> 6.5.0) - money (6.5.1) - i18n (>= 0.6.4, <= 0.7.0) - money-rails (1.4.1) + monetize (1.6.0) + money (~> 6.8) + money (6.8.3) + i18n (>= 0.6.4, < 0.9) + sixarm_ruby_unaccent (>= 1.1.1, < 2) + money-rails (1.8.0) activesupport (>= 3.0) - monetize (~> 1.1.0) - money (~> 6.5.0) + monetize (~> 1.6.0) + money (~> 6.8.1) railties (>= 3.0) multi_json (1.12.1) multi_xml (0.6.0) @@ -488,6 +490,7 @@ GEM rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) + sixarm_ruby_unaccent (1.1.1) slop (3.6.0) socksify (1.7.1) spring (1.3.6) @@ -519,6 +522,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) @@ -565,13 +569,13 @@ DEPENDENCIES capybara (= 2.4.4) coderay (= 1.1.0) coffee-rails (= 4.1.0) - countries (= 0.11.4) + countries (= 2.0.8) daemons-rails (= 1.2.1) data_migrate! database_cleaner deep_cloneable (= 2.1.1) devise (= 3.5.4) - digidoc_client (= 0.2.1) + digidoc_client (= 0.3.0) epp (= 1.5.0)! epp-xml (= 1.1.0)! fabrication (= 2.13.2) @@ -596,7 +600,7 @@ DEPENDENCIES launchy (= 2.4.3) liquid (= 3.0.6) mina (= 0.3.1) - money-rails (= 1.4.1) + money-rails (= 1.8.0) nokogiri (= 1.7.1) nprogress-rails (= 0.1.6.7) paper_trail!