diff options
| author | John Cai <jcai@gitlab.com> | 2022-08-19 01:51:49 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2022-08-19 01:51:49 +0300 |
| commit | ab3217ace2c2ad472118afd820ec5ba3bcbc51df (patch) | |
| tree | b6d23782be42ea23435599de5f6e3def209e8c19 | |
| parent | bcabbb9feb2e80a3dd9930a6033997a364996368 (diff) | |
| parent | 5a64218610feb05b833647b4e703386b2d1564f0 (diff) | |
Merge branch 'tnir-ruby-licensee-to-9.15.2' into 'master'
Add support for MulanPSL-2.0 in license detection
See merge request gitlab-org/gitaly!4825
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 855c28efc..478658e68 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -17,7 +17,7 @@ gem 'gitlab-labkit', '~> 0.23' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE -gem 'licensee', '~> 9.14.1' +gem 'licensee', '~> 9.15' gem 'google-protobuf', '~> 3.21.0' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 64efebfc3..72e36b49d 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -95,9 +95,9 @@ GEM opentracing (~> 0.3) thrift json (2.5.1) - licensee (9.14.1) + licensee (9.15.2) dotenv (~> 2.0) - octokit (~> 4.17) + octokit (~> 4.20) reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) @@ -237,7 +237,7 @@ DEPENDENCIES google-protobuf (~> 3.21.0) grpc (~> 1.42.0) grpc-tools (~> 1.42.0) - licensee (~> 9.14.1) + licensee (~> 9.15) pry (~> 0.12.2) rbtrace rdoc (~> 6.0) |