Commit: 2bf6ecb42af1e387a7b45dbcb2f1e411d8266cdd - nvc_serv (git)

Voice data server for navigation voice changer app.

Commit MetaInfo

• Revision: 2bf6ecb42af1e387a7b45dbcb2f1e411d8266cdd (tree)
• Zeit: 2017-11-11 16:53:59
• Autor: HMML <hmml3939@gmai...>
• Commiter: HMML

Log Message

Fix nokogiri dependency.

Ändern Zusammenfassung

• modified: Gemfile
• modified: Gemfile.lock

Diff

--- a/Gemfile
+++ b/Gemfile
@@ -62,8 +62,7 @@ gem 'rspec-rails', group: [:development, :test]
 gem 'paperclip'
 gem 'rubyzip', '< 1.0.0', require: 'zip/zip'
 gem 'rails_admin'
-gem 'nokogiri', '1.6.8' # fix version to comapt with mini_portile
-gem 'mini_portile2', '~> 2.1.0' # to build noogiri
+gem 'nokogiri'
 gem 'puma'
 group :develpment do
   gem 'capistrano'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -137,15 +137,14 @@ GEM
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.2.0)
-    nokogiri (1.6.8)
-      pkg-config (~> 1.1.7)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
     paperclip (5.1.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
-    pkg-config (1.1.7)
     puma (3.6.0)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
@@ -285,9 +284,8 @@ DEPENDENCIES
   jbuilder (~> 1.2)
   jquery-rails
   kaminari
-  mini_portile2 (~> 2.1.0)
   mysql2
-  nokogiri (= 1.6.8)
+  nokogiri
   paperclip
   puma
   quiet_assets
@@ -307,4 +305,4 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
 
 BUNDLED WITH
-   1.12.5
+   1.15.4