diff options
| author | Toon Claes <toon@gitlab.com> | 2021-11-22 14:42:27 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2021-11-22 14:42:27 +0300 |
| commit | c50096ad93c55ca1458e352bc7144eb883001d71 (patch) | |
| tree | 572430a8dd1e4736ab35b0a1064c11b1cf6d619c | |
| parent | 78f38ee2cc35e02c4cb0c42def3e3378970e7afb (diff) | |
| parent | 0c55f88c26562a922e249a4d660146d6f06336a3 (diff) | |
Merge branch 'include-license-finder' into 'master'
Include license_finder in the bundle to be used by omnibus-gitlab
See merge request gitlab-org/gitaly!4112
| -rw-r--r-- | ruby/Gemfile | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 15 |
2 files changed, 20 insertions, 0 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 6568c0c3c..95863cf5b 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -31,3 +31,8 @@ group :development, :test do gem 'grpc-tools', '= 1.30.2' end + +# Gems required in omnibus-gitlab pipeline +group :development, :test, :omnibus do + gem 'license_finder', require: false +end diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index b5c5ec672..61f5d703e 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -88,6 +88,13 @@ 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) @@ -121,6 +128,7 @@ 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) @@ -184,6 +192,7 @@ GEM rubocop-ast (0.2.0) parser (>= 2.7.0.1) ruby-progressbar (1.10.1) + rubyzip (2.3.2) rugged (1.2.0) sanitize (4.6.6) crass (~> 1.0.2) @@ -199,6 +208,8 @@ GEM thread_safe (0.3.6) thrift (0.15.0) timecop (0.9.1) + toml (0.2.0) + parslet (~> 1.8.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) unicode-display_width (1.7.0) @@ -210,6 +221,9 @@ GEM equalizer (~> 0.0.9) parser (>= 2.6.5) procto (~> 0.0.2) + with_env (1.1.0) + xml-simple (1.1.9) + rexml zeitwerk (2.4.2) PLATFORMS @@ -227,6 +241,7 @@ DEPENDENCIES 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 |