From d5f138b3dc6540b5b1684da3e1b54f1557cd1471 Mon Sep 17 00:00:00 2001 From: Christian Bruckmayer Date: Mon, 7 Mar 2016 18:28:14 +0100 Subject: [PATCH] Update country_select gem and removed git repository from Gemfile. Caused bundle install error in vagrant box. --- Gemfile | 2 +- Gemfile.lock | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 890425e7..a7d8548f 100644 --- a/Gemfile +++ b/Gemfile @@ -94,7 +94,7 @@ gem 'chart-js-rails' gem 'gravtastic' # for country selects -gem 'country_select', github: 'stefanpenner/country_select' +gem 'country_select' # for upload management gem 'paperclip' diff --git a/Gemfile.lock b/Gemfile.lock index a958697c..995bf235 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,3 @@ -GIT - remote: git://github.com/stefanpenner/country_select.git - revision: 585e9538a01ae9878e92f12a98261a09842ed015 - specs: - country_select (2.1.0) - countries (~> 0.9, >= 0.9.3) - GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ @@ -122,8 +115,12 @@ GEM execjs coffee-script-source (1.10.0) columnize (0.8.9) - countries (0.9.3) + countries (1.2.5) currencies (~> 0.4.2) + i18n_data (~> 0.7.0) + country_select (2.5.2) + countries (~> 1.2.0) + sort_alphabetical (~> 1.0) coveralls (0.7.0) multi_json (~> 1.3) rest-client @@ -197,6 +194,7 @@ GEM builder htmlentities (4.3.1) i18n (0.7.0) + i18n_data (0.7.0) inversion (0.12.3) loggability (~> 0.4) jquery-datatables-rails (2.2.3) @@ -431,6 +429,8 @@ GEM simplecov-html (0.8.0) sixarm_ruby_unaccent (1.1.1) slop (3.6.0) + sort_alphabetical (1.0.2) + unicode_utils (>= 1.2.2) spring (1.6.3) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -462,6 +462,7 @@ GEM execjs (>= 0.3.0) json (>= 1.8.0) unicode-display_width (0.3.1) + unicode_utils (1.4.0) unobtrusive_flash (3.1.0) railties user_agent_parser (2.1.5) @@ -504,7 +505,7 @@ DEPENDENCIES capybara chart-js-rails cocoon - country_select! + country_select coveralls daemons database_cleaner