diff --git a/Gemfile b/Gemfile index d081767..c00c923 100644 --- a/Gemfile +++ b/Gemfile @@ -11,9 +11,9 @@ gem 'will_paginate', '~> 3.0.3' gem 'ruby-feedparser', '~> 0.7' gem 'daemons', '~> 1.1.5' #gem 'thin', '~> 1.3.1' -#gem 'nokogiri', '~> 1.6.0' +gem 'nokogiri', '~> 1.6.0' gem 'unicorn', '~> 4.8' -gem 'nokogiri', '~> 1.5.5' +#gem 'nokogiri', '~> 1.5.5' gem 'rake', :require => false gem 'rest-client', '~> 1.6.7' gem 'exception_notification', '~> 4.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 63ff3ad..1cb53b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,7 +89,7 @@ GEM actionmailer (>= 3.0.4) activesupport (>= 3.0.4) execjs (2.6.0) - faraday (0.9.1) + faraday (0.9.2) multipart-post (>= 1.2, < 3) faraday_middleware (0.10.0) faraday (>= 0.7.4, < 0.10) @@ -138,13 +138,15 @@ GEM treetop (~> 1.4.8) metaclass (0.0.4) mime-types (1.25.1) + mini_portile (0.6.2) minitest (3.2.0) mocha (1.1.0) metaclass (~> 0.0.1) multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) - nokogiri (1.5.11) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) oai (0.3.1) builder (>= 2.0.0) faraday @@ -197,9 +199,9 @@ GEM rest-client (1.6.9) mime-types (~> 1.16) rmagick (2.13.4) - roadie (3.1.0.rc1) + roadie (3.0.5) css_parser (~> 1.3.4) - nokogiri (>= 1.5.0, < 1.7.0) + nokogiri (~> 1.6.0) roadie-rails (1.0.6) railties (>= 3.0, < 4.3) roadie (~> 3.0) @@ -297,7 +299,7 @@ DEPENDENCIES locale (~> 2.0.5) minitest (~> 3.2.0) mocha (~> 1.1.0) - nokogiri (~> 1.5.5) + nokogiri (~> 1.6.0) oai (= 0.3.1) pg (~> 0.13.2) rack-contrib @@ -309,7 +311,7 @@ DEPENDENCIES rdf-virtuoso rest-client (~> 1.6.7) rmagick (~> 2.13.1) - roadie + roadie (= 3.0.5) roadie-rails rspec (~> 2.14.0) rspec-rails (~> 2.14.1) diff --git a/plugins/virtuoso/Gemfile b/plugins/virtuoso/Gemfile index 691006e..48c8dda 100644 --- a/plugins/virtuoso/Gemfile +++ b/plugins/virtuoso/Gemfile @@ -5,3 +5,4 @@ gem 'oai', '0.3.1' gem 'liquid', '~> 3.0.3' gem 'roadie', '3.0.5' gem 'roadie-rails' +#gem 'nokogiri', '1.6.6.2' -- libgit2 0.21.2