Commit 604664b4 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'winh-update-license_finder' into 'master'

Update license_finder to 3.1.1

Closes #34955 et #40020

See merge request gitlab-org/gitlab-ce!15319
parents 37cca88d b256c5e2
Pipeline #14022179 passed with stages
in 51 minutes and 56 seconds
......@@ -343,7 +343,7 @@ group :development, :test do
gem 'benchmark-ips', '~> 2.3.0', require: false
gem 'license_finder', '~> 2.1.0', require: false
gem 'license_finder', '~> 3.1', require: false
gem 'knapsack', '~> 1.11.0'
gem 'activerecord_sane_schema_dumper', '0.2'
......
......@@ -83,6 +83,7 @@ GEM
bindata (2.4.1)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
blankslate (2.1.2.4)
bootstrap-sass (3.3.6)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
......@@ -451,11 +452,13 @@ GEM
actionmailer (>= 3.2)
letter_opener (~> 1.0)
railties (>= 3.2)
license_finder (2.1.0)
license_finder (3.1.1)
bundler
httparty
rubyzip
thor
toml (= 0.1.2)
with_env (> 1.0)
xml-simple
licensee (8.7.0)
rugged (~> 0.24)
......@@ -571,6 +574,8 @@ GEM
activerecord (>= 4.0, < 5.2)
parser (2.4.0.0)
ast (~> 2.2)
parslet (1.5.0)
blankslate (~> 2.0)
path_expander (1.0.1)
peek (1.0.1)
concurrent-ruby (>= 0.9.0)
......@@ -898,6 +903,8 @@ GEM
tilt (2.0.6)
timecop (0.8.1)
timfel-krb5-auth (0.8.3)
toml (0.1.2)
parslet (~> 1.5.0)
toml-rb (0.3.15)
citrus (~> 3.0, > 3.0)
truncato (0.7.10)
......@@ -952,6 +959,7 @@ GEM
builder
expression_parser
rinku
with_env (1.1.0)
xml-simple (1.1.5)
xpath (2.1.0)
nokogiri (~> 1.3)
......@@ -1058,7 +1066,7 @@ DEPENDENCIES
knapsack (~> 1.11.0)
kubeclient (~> 2.2.0)
letter_opener_web (~> 1.3.0)
license_finder (~> 2.1.0)
license_finder (~> 3.1)
licensee (~> 8.7.0)
lograge (~> 0.5)
loofah (~> 2.0.3)
......
......@@ -471,3 +471,35 @@
:why:
:versions: []
:when: 2017-10-17 17:46:12.367554000 Z
- - :license
- component-emitter
- MIT
- :who: Winnie Hellmann
:why: package.json does not specify the license (README.md does)
:versions:
- 1.1.2
:when: 2017-11-13 12:23:10.502463000 Z
- - :license
- json-schema
- BSD
- :who: Winnie Hellmann
:why: https://github.com/kriszyp/json-schema/blob/v0.2.3/package.json#L18-L19
:versions:
- 0.2.3
:when: 2017-11-16 12:52:18.286091000 Z
- - :license
- node-forge
- New BSD
- :who: Winnie Hellmann
:why: https://github.com/digitalbazaar/forge/blob/0.6.33/LICENSE
:versions:
- 0.6.33
:when: 2017-11-16 12:56:17.974767000 Z
- - :license
- sntp
- BSD
- :who: Winnie Hellmann
:why: https://github.com/hueniverse/sntp/blob/v1.0.9/package.json#L28-L29
:versions:
- 1.0.9
:when: 2017-11-16 13:02:06.765282000 Z
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment