diff options
| author | Balasankar "Balu" C <balasankar@gitlab.com> | 2021-11-23 08:30:30 +0300 |
|---|---|---|
| committer | Balasankar "Balu" C <balasankar@gitlab.com> | 2021-11-23 08:33:04 +0300 |
| commit | 13501a23c4b36ba226fbae6bffa79017ecb677e4 (patch) | |
| tree | 964c8711bb144ec7cb280f5158c48a0a0dd1517b | |
| parent | ebd0f47c838101dc61cd6e48b1b25ec7c3b34e9b (diff) | |
Switch to gitlab-license_finder and bump to 6.14.2.1
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
| -rw-r--r-- | ruby/Gemfile | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 20 |
2 files changed, 13 insertions, 12 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 95863cf5b..bec450d04 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -34,5 +34,8 @@ end # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do - gem 'license_finder', require: false + # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is + # resolved. For details, check discussion in + # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74881 + gem 'gitlab-license_finder', require: false end diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 61f5d703e..767567ca7 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -73,6 +73,13 @@ GEM opentracing (~> 0.4) pg_query (~> 2.1) redis (> 3.0.0, < 5.0.0) + gitlab-license_finder (6.14.2.1) + bundler + rubyzip (>= 1, < 3) + thor (~> 1.0) + tomlrb (>= 1.3, < 2.1) + with_env (= 1.1.0) + xml-simple (~> 1.1.5) gitlab-markup (1.7.1) google-protobuf (3.17.3) googleapis-common-protos-types (1.1.0) @@ -88,13 +95,6 @@ GEM opentracing (~> 0.3) thrift json (2.5.1) - license_finder (6.0.0) - bundler - rubyzip (>= 1, < 3) - thor - toml (= 0.2.0) - with_env (= 1.1.0) - xml-simple licensee (9.14.1) dotenv (~> 2.0) octokit (~> 4.17) @@ -128,7 +128,6 @@ GEM parallel (1.19.2) parser (2.7.2.0) ast (~> 2.4.1) - parslet (1.8.2) pg_query (2.1.1) google-protobuf (>= 3.17.1) proc_to_ast (0.1.0) @@ -208,8 +207,7 @@ GEM thread_safe (0.3.6) thrift (0.15.0) timecop (0.9.1) - toml (0.2.0) - parslet (~> 1.8.0) + tomlrb (2.0.1) tzinfo (2.0.4) concurrent-ruby (~> 1.0) unicode-display_width (1.7.0) @@ -237,11 +235,11 @@ DEPENDENCIES gitlab-gollum-lib (~> 4.2.7.10.gitlab.1) gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) gitlab-labkit (~> 0.21.1) + gitlab-license_finder gitlab-markup (~> 1.7.1) google-protobuf (~> 3.17.0) grpc (~> 1.30.2) grpc-tools (= 1.30.2) - license_finder licensee (~> 9.14.1) pry (~> 0.12.2) rbtrace |