diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-23 15:11:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-23 15:11:19 +0000 |
| commit | 0e6ce73070a9816db513ba360620699232c517d7 (patch) | |
| tree | 1821d40de1b43624cde5d09e9874dc38978a65e1 /Gemfile.lock | |
| parent | ead6ab29b07201cd30488aa21b88d3e9c270046f (diff) | |
| download | gitlab-ce-0e6ce73070a9816db513ba360620699232c517d7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1bd733cde9f..07565f86390 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -481,6 +481,13 @@ GEM pg_query (~> 2.1) redis (> 3.0.0, < 5.0.0) gitlab-license (2.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-mail_room (0.0.9) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) @@ -707,13 +714,6 @@ GEM railties (>= 5.2) rexml libyajl2 (1.2.0) - 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) @@ -1275,8 +1275,6 @@ GEM timecop (0.9.1) timeliness (0.3.10) timfel-krb5-auth (0.8.3) - toml (0.2.0) - parslet (~> 1.8.0) toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) @@ -1475,6 +1473,7 @@ DEPENDENCIES gitlab-fog-azure-rm (~> 1.2.0) gitlab-labkit (~> 0.21.1) gitlab-license (~> 2.0) + gitlab-license_finder (~> 6.0) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) @@ -1523,7 +1522,6 @@ DEPENDENCIES kubeclient (~> 4.9.2) lefthook (~> 0.7.0) letter_opener_web (~> 2.0.0) - license_finder (~> 6.0) licensee (~> 9.14.1) lockbox (~> 0.6.2) lograge (~> 0.5) |