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 /config | |
| 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
Diffstat (limited to 'config')
| -rw-r--r-- | config/dependency_decisions.yml | 6 |
1 files changed, 6 insertions, 0 deletions
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 |