Commit e1efe793e99f19411ac3df142161d4128b885553
1 parent
883061f3
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
updating gemfile
Showing
3 changed files
with
11 additions
and
8 deletions
Show diff stats
Gemfile
| ... | ... | @@ -11,9 +11,9 @@ gem 'will_paginate', '~> 3.0.3' |
| 11 | 11 | gem 'ruby-feedparser', '~> 0.7' |
| 12 | 12 | gem 'daemons', '~> 1.1.5' |
| 13 | 13 | #gem 'thin', '~> 1.3.1' |
| 14 | -#gem 'nokogiri', '~> 1.6.0' | |
| 14 | +gem 'nokogiri', '~> 1.6.0' | |
| 15 | 15 | gem 'unicorn', '~> 4.8' |
| 16 | -gem 'nokogiri', '~> 1.5.5' | |
| 16 | +#gem 'nokogiri', '~> 1.5.5' | |
| 17 | 17 | gem 'rake', :require => false |
| 18 | 18 | gem 'rest-client', '~> 1.6.7' |
| 19 | 19 | gem 'exception_notification', '~> 4.0.1' | ... | ... |
Gemfile.lock
| ... | ... | @@ -89,7 +89,7 @@ GEM |
| 89 | 89 | actionmailer (>= 3.0.4) |
| 90 | 90 | activesupport (>= 3.0.4) |
| 91 | 91 | execjs (2.6.0) |
| 92 | - faraday (0.9.1) | |
| 92 | + faraday (0.9.2) | |
| 93 | 93 | multipart-post (>= 1.2, < 3) |
| 94 | 94 | faraday_middleware (0.10.0) |
| 95 | 95 | faraday (>= 0.7.4, < 0.10) |
| ... | ... | @@ -138,13 +138,15 @@ GEM |
| 138 | 138 | treetop (~> 1.4.8) |
| 139 | 139 | metaclass (0.0.4) |
| 140 | 140 | mime-types (1.25.1) |
| 141 | + mini_portile (0.6.2) | |
| 141 | 142 | minitest (3.2.0) |
| 142 | 143 | mocha (1.1.0) |
| 143 | 144 | metaclass (~> 0.0.1) |
| 144 | 145 | multi_json (1.11.2) |
| 145 | 146 | multi_xml (0.5.5) |
| 146 | 147 | multipart-post (2.0.0) |
| 147 | - nokogiri (1.5.11) | |
| 148 | + nokogiri (1.6.6.2) | |
| 149 | + mini_portile (~> 0.6.0) | |
| 148 | 150 | oai (0.3.1) |
| 149 | 151 | builder (>= 2.0.0) |
| 150 | 152 | faraday |
| ... | ... | @@ -197,9 +199,9 @@ GEM |
| 197 | 199 | rest-client (1.6.9) |
| 198 | 200 | mime-types (~> 1.16) |
| 199 | 201 | rmagick (2.13.4) |
| 200 | - roadie (3.1.0.rc1) | |
| 202 | + roadie (3.0.5) | |
| 201 | 203 | css_parser (~> 1.3.4) |
| 202 | - nokogiri (>= 1.5.0, < 1.7.0) | |
| 204 | + nokogiri (~> 1.6.0) | |
| 203 | 205 | roadie-rails (1.0.6) |
| 204 | 206 | railties (>= 3.0, < 4.3) |
| 205 | 207 | roadie (~> 3.0) |
| ... | ... | @@ -297,7 +299,7 @@ DEPENDENCIES |
| 297 | 299 | locale (~> 2.0.5) |
| 298 | 300 | minitest (~> 3.2.0) |
| 299 | 301 | mocha (~> 1.1.0) |
| 300 | - nokogiri (~> 1.5.5) | |
| 302 | + nokogiri (~> 1.6.0) | |
| 301 | 303 | oai (= 0.3.1) |
| 302 | 304 | pg (~> 0.13.2) |
| 303 | 305 | rack-contrib |
| ... | ... | @@ -309,7 +311,7 @@ DEPENDENCIES |
| 309 | 311 | rdf-virtuoso |
| 310 | 312 | rest-client (~> 1.6.7) |
| 311 | 313 | rmagick (~> 2.13.1) |
| 312 | - roadie | |
| 314 | + roadie (= 3.0.5) | |
| 313 | 315 | roadie-rails |
| 314 | 316 | rspec (~> 2.14.0) |
| 315 | 317 | rspec-rails (~> 2.14.1) | ... | ... |
plugins/virtuoso/Gemfile