diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-07 20:36:54 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-07 20:36:54 +0000 |
| commit | 4531b5da649998d2dd059320f9bce038fe870ba0 (patch) | |
| tree | e495a804d795a99ab8e21257718e89f90e703d5d | |
| parent | 2cbb17da31be0d18e8457232255da0bd5ac87db5 (diff) | |
| parent | 5bb3e1934c2a059c8e7cdc4ecbe597781f502a3e (diff) | |
| download | gitlab-ce-4531b5da649998d2dd059320f9bce038fe870ba0.tar.gz | |
Merge branch 'upgrade-nokogiri' into 'master'
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
See merge request !4500
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | config/dependency_decisions.yml | 6 |
3 files changed, 12 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index de3aeab0d46..b9189b80889 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ v 8.9.0 (unreleased) - Redesign navigation for project pages - Fix groups API to list only user's accessible projects - Redesign account and email confirmation emails + - Bump nokogiri to 1.6.8 - Use gitlab-shell v3.0.0 - Use Knapsack to evenly distribute tests across multiple nodes - Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged 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) diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index a49d805e4f9..436a2c5e17a 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -175,3 +175,9 @@ :why: https://github.com/jmcnevin/rubypants/blob/master/LICENSE.rdoc :versions: [] :when: 2016-05-02 05:56:50.696858000 Z +- - :whitelist + - LGPLv2+ + - :who: Stan Hu + :why: Equivalent to LGPLv2 + :versions: [] + :when: 2016-06-07 17:14:10.907682000 Z |