diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-08-30 15:38:52 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-30 15:38:52 +0000 |
| commit | 6afdf7423894241e3ecc415c341a5ee53dcbed7d (patch) | |
| tree | a43b33f9bfa30457367bc82e6f2be92a0cea94f1 | |
| parent | ff0a5936275a6f098d06c3d092090e10643f213a (diff) | |
| parent | 9b7753ed85326d6273cc8318e6f3b0d4e8a9c2a8 (diff) | |
| download | gitlab-ce-6afdf7423894241e3ecc415c341a5ee53dcbed7d.tar.gz | |
Merge branch 'winh-upgrade-license-finder' into 'master'
Upgrade LicenseFinder Gem to v5.4.0
See merge request gitlab-org/gitlab-ce!21431
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 19 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 19 |
3 files changed, 17 insertions, 23 deletions
@@ -368,7 +368,7 @@ group :development, :test do gem 'benchmark-ips', '~> 2.3.0', require: false - gem 'license_finder', '~> 3.1', require: false + gem 'license_finder', '~> 5.4', require: false gem 'knapsack', '~> 1.16' gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] diff --git a/Gemfile.lock b/Gemfile.lock index 754b2e56de1..11921a64900 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,7 +86,6 @@ GEM bindata (2.4.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - blankslate (2.1.2.4) bootsnap (1.3.1) msgpack (~> 1.0) bootstrap_form (2.7.0) @@ -465,13 +464,12 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (3.1.1) + license_finder (5.4.0) bundler - httparty rubyzip thor - toml (= 0.1.2) - with_env (> 1.0) + toml (= 0.2.0) + with_env (= 1.1.0) xml-simple licensee (8.9.2) rugged (~> 0.24) @@ -589,8 +587,7 @@ GEM parallel (1.12.1) parser (2.5.1.0) ast (~> 2.4.0) - parslet (1.5.0) - blankslate (~> 2.0) + parslet (1.8.2) path_expander (1.0.2) peek (1.0.1) concurrent-ruby (>= 0.9.0) @@ -910,8 +907,8 @@ GEM tilt (2.0.8) timecop (0.8.1) timfel-krb5-auth (0.8.3) - toml (0.1.2) - parslet (~> 1.5.0) + toml (0.2.0) + parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) trollop (2.1.3) @@ -1084,7 +1081,7 @@ DEPENDENCIES knapsack (~> 1.16) kubeclient (~> 3.1.0) letter_opener_web (~> 1.3.0) - license_finder (~> 3.1) + license_finder (~> 5.4) licensee (~> 8.9) lograge (~> 0.5) loofah (~> 2.2) @@ -1205,4 +1202,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.16.3 + 1.16.4 diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 5091c671b8b..02f9e112300 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -89,7 +89,6 @@ GEM bindata (2.4.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - blankslate (2.1.2.4) bootsnap (1.3.1) msgpack (~> 1.0) bootstrap_form (2.7.0) @@ -468,13 +467,12 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (3.1.1) + license_finder (5.4.0) bundler - httparty rubyzip thor - toml (= 0.1.2) - with_env (> 1.0) + toml (= 0.2.0) + with_env (= 1.1.0) xml-simple licensee (8.9.2) rugged (~> 0.24) @@ -593,8 +591,7 @@ GEM parallel (1.12.1) parser (2.5.1.0) ast (~> 2.4.0) - parslet (1.5.0) - blankslate (~> 2.0) + parslet (1.8.2) path_expander (1.0.2) peek (1.0.1) concurrent-ruby (>= 0.9.0) @@ -917,8 +914,8 @@ GEM tilt (2.0.8) timecop (0.8.1) timfel-krb5-auth (0.8.3) - toml (0.1.2) - parslet (~> 1.5.0) + toml (0.2.0) + parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) trollop (2.1.3) @@ -1094,7 +1091,7 @@ DEPENDENCIES knapsack (~> 1.16) kubeclient (~> 3.1.0) letter_opener_web (~> 1.3.0) - license_finder (~> 3.1) + license_finder (~> 5.4) licensee (~> 8.9) lograge (~> 0.5) loofah (~> 2.2) @@ -1215,4 +1212,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.16.3 + 1.16.4 |