summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-06-06 21:34:08 -0700
committerStan Hu <stanhu@gmail.com>2016-06-07 08:50:17 -0700
commit8e41b21db187c6f6cfe5c0c70e986f63c11d0c25 (patch)
treebf2e07c17468fc8d123ede0af133bb52cabb6a01 /Gemfile.lock
parent5b83abcc01bd4a24268126dc52019b9f11152a7c (diff)
downloadgitlab-ce-8e41b21db187c6f6cfe5c0c70e986f63c11d0c25.tar.gz
Bump nokogiri to 1.6.8
Number of important security and bug fixes. See: https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md#168--2016-06-06
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock8
1 files changed, 5 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index c85f9be7783..489c7e7b44d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -390,7 +390,7 @@ GEM
method_source (0.8.2)
mime-types (2.99.1)
mimemagic (0.3.0)
- mini_portile2 (2.0.0)
+ mini_portile2 (2.1.0)
minitest (5.7.0)
mousetrap-rails (1.4.6)
multi_json (1.11.2)
@@ -401,8 +401,9 @@ GEM
net-ldap (0.12.1)
net-ssh (3.0.1)
newrelic_rpm (3.14.1.311)
- nokogiri (1.6.7.2)
- mini_portile2 (~> 2.0.0.rc2)
+ nokogiri (1.6.8)
+ mini_portile2 (~> 2.1.0)
+ pkg-config (~> 1.1.7)
oauth (0.4.7)
oauth2 (1.0.0)
faraday (>= 0.8, < 0.10)
@@ -474,6 +475,7 @@ GEM
parser (2.3.1.0)
ast (~> 2.2)
pg (0.18.4)
+ pkg-config (1.1.7)
poltergeist (1.9.0)
capybara (~> 2.1)
cliver (~> 0.3.1)