From add908a9055f770c91ce2655d61a872414a467c6 Mon Sep 17 00:00:00 2001
From: Aleksei Lipniagov <alipniagov@gitlab.com>
Date: Thu, 17 Aug 2023 16:34:06 +0200
Subject: [PATCH] Update licensee gem to 9.16.0
Update gem version, drop monkey patch.
---
Gemfile | 6 ++----
Gemfile.checksum | 2 +-
Gemfile.lock | 8 ++++----
config/initializers/licensee_license_patch.rb | 14 --------------
4 files changed, 7 insertions(+), 23 deletions(-)
delete mode 100644 config/initializers/licensee_license_patch.rb
diff --git a/Gemfile b/Gemfile
index a8b1e14a494a9..f07ab1af0b5cc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -308,10 +308,8 @@ gem 'babosa', '~> 2.0'
# Sanitizes SVG input
gem 'loofah', '~> 2.21.3'
-# Working with license
-# Detects the open source license the repository includes
-# This version needs to be in sync with gitlab-org/gitaly
-gem 'licensee', '~> 9.15'
+# Used to provide license templates
+gem 'licensee', '~> 9.16'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.7'
diff --git a/Gemfile.checksum b/Gemfile.checksum
index eebf8fed5927f..f36fb05fcc255 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -335,7 +335,7 @@
{"name":"letter_opener_web","version":"2.0.0","platform":"ruby","checksum":"33860ad41e1785d75456500e8ca8bba8ed71ee6eaf08a98d06bbab67c5577b6f"},
{"name":"libyajl2","version":"1.2.0","platform":"ruby","checksum":"1117cd1e48db013b626e36269bbf1cef210538ca6d2e62d3fa3db9ded005b258"},
{"name":"license_finder","version":"7.0.1","platform":"ruby","checksum":"0b22c9567e2a8b102c7245da49ebeddaec60f66d237d2bb91b9feddf5d242f6a"},
-{"name":"licensee","version":"9.15.2","platform":"ruby","checksum":"4b6959b544da88499d3be0d9f486179c90b93d5049ef500ae340ac1420493ded"},
+{"name":"licensee","version":"9.16.0","platform":"ruby","checksum":"7b1693639019dbb1d3e020d72c4470ca84da3cfc67e4d6da1d1cdcb736d09044"},
{"name":"listen","version":"3.7.1","platform":"ruby","checksum":"3b80caa7aa77fae836916c2f9e3fbcafbd15f5d695dd487c1f5b5e7e465efe29"},
{"name":"llhttp-ffi","version":"0.4.0","platform":"ruby","checksum":"e5f7327db3cf8007e648342ef76347d6e0ae545a8402e519cca9c886eb37b001"},
{"name":"locale","version":"2.1.3","platform":"ruby","checksum":"b6ddee011e157817cb98e521b3ce7cb626424d5882f1e844aafdee3e8b212725"},
diff --git a/Gemfile.lock b/Gemfile.lock
index 04fe6459575ef..a1c1e575a596e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -959,10 +959,10 @@ GEM
tomlrb (>= 1.3, < 2.1)
with_env (= 1.1.0)
xml-simple (~> 1.1.9)
- licensee (9.15.2)
+ licensee (9.16.0)
dotenv (~> 2.0)
- octokit (~> 4.20)
- reverse_markdown (~> 1.0)
+ octokit (>= 4.20, < 7.0)
+ reverse_markdown (>= 1, < 3)
rugged (>= 0.24, < 2.0)
thor (>= 0.19, < 2.0)
listen (3.7.1)
@@ -1882,7 +1882,7 @@ DEPENDENCIES
lefthook (~> 1.4.7)
letter_opener_web (~> 2.0.0)
license_finder (~> 7.0)
- licensee (~> 9.15)
+ licensee (~> 9.16)
listen (~> 3.7)
lockbox (~> 1.1.1)
lograge (~> 0.5)
diff --git a/config/initializers/licensee_license_patch.rb b/config/initializers/licensee_license_patch.rb
deleted file mode 100644
index d4680db507190..0000000000000
--- a/config/initializers/licensee_license_patch.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'licensee/license'
-
-module Licensee
- module LicensePatch
- # Patch from https://github.com/licensee/licensee/pull/589
- def ==(other)
- other.is_a?(self.class) && key == other.key
- end
- end
-
- License.prepend LicensePatch
-end
--
GitLab