summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2017-11-16 14:14:29 +0000
committerRémy Coutable <remy@rymai.me>2017-11-16 14:14:29 +0000
commitb256c5e2a47d5a10d7d2ce682442560ff412b10a (patch)
treec409bfca0d531b3389ec5d24bcdef8e14ca73627
parent37cca88d055491d1b2b15b72aa6968eb076da2a0 (diff)
downloadgitlab-ce-b256c5e2a47d5a10d7d2ce682442560ff412b10a.tar.gz
Update license_finder to 3.1.1
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock12
-rw-r--r--config/dependency_decisions.yml32
3 files changed, 43 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index c495e4eceba..e357d76328a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'
diff --git a/Gemfile.lock b/Gemfile.lock
index 43555a01037..dc56e6e8f82 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml
index 4004e4d767d..60df92a44fc 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -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