summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-04-20 10:00:54 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-04-20 10:00:54 +0000
commit3cccd102ba543e02725d247893729e5c73b38295 (patch)
treef36a04ec38517f5deaaacb5acc7d949688d1e187 /Gemfile.lock
parent205943281328046ef7b4528031b90fbda70c75ac (diff)
downloadgitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock170
1 files changed, 87 insertions, 83 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f97c2bf67ec..9a67aa1b017 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,63 +11,63 @@ GEM
RedCloth (4.3.2)
acme-client (2.0.9)
faraday (>= 0.17, < 2.0.0)
- actioncable (6.1.4.6)
- actionpack (= 6.1.4.6)
- activesupport (= 6.1.4.6)
+ actioncable (6.1.4.7)
+ actionpack (= 6.1.4.7)
+ activesupport (= 6.1.4.7)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailbox (6.1.4.6)
- actionpack (= 6.1.4.6)
- activejob (= 6.1.4.6)
- activerecord (= 6.1.4.6)
- activestorage (= 6.1.4.6)
- activesupport (= 6.1.4.6)
+ actionmailbox (6.1.4.7)
+ actionpack (= 6.1.4.7)
+ activejob (= 6.1.4.7)
+ activerecord (= 6.1.4.7)
+ activestorage (= 6.1.4.7)
+ activesupport (= 6.1.4.7)
mail (>= 2.7.1)
- actionmailer (6.1.4.6)
- actionpack (= 6.1.4.6)
- actionview (= 6.1.4.6)
- activejob (= 6.1.4.6)
- activesupport (= 6.1.4.6)
+ actionmailer (6.1.4.7)
+ actionpack (= 6.1.4.7)
+ actionview (= 6.1.4.7)
+ activejob (= 6.1.4.7)
+ activesupport (= 6.1.4.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (6.1.4.6)
- actionview (= 6.1.4.6)
- activesupport (= 6.1.4.6)
+ actionpack (6.1.4.7)
+ actionview (= 6.1.4.7)
+ activesupport (= 6.1.4.7)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (6.1.4.6)
- actionpack (= 6.1.4.6)
- activerecord (= 6.1.4.6)
- activestorage (= 6.1.4.6)
- activesupport (= 6.1.4.6)
+ actiontext (6.1.4.7)
+ actionpack (= 6.1.4.7)
+ activerecord (= 6.1.4.7)
+ activestorage (= 6.1.4.7)
+ activesupport (= 6.1.4.7)
nokogiri (>= 1.8.5)
- actionview (6.1.4.6)
- activesupport (= 6.1.4.6)
+ actionview (6.1.4.7)
+ activesupport (= 6.1.4.7)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
- activejob (6.1.4.6)
- activesupport (= 6.1.4.6)
+ activejob (6.1.4.7)
+ activesupport (= 6.1.4.7)
globalid (>= 0.3.6)
- activemodel (6.1.4.6)
- activesupport (= 6.1.4.6)
- activerecord (6.1.4.6)
- activemodel (= 6.1.4.6)
- activesupport (= 6.1.4.6)
+ activemodel (6.1.4.7)
+ activesupport (= 6.1.4.7)
+ activerecord (6.1.4.7)
+ activemodel (= 6.1.4.7)
+ activesupport (= 6.1.4.7)
activerecord-explain-analyze (0.1.0)
activerecord (>= 4)
pg
- activestorage (6.1.4.6)
- actionpack (= 6.1.4.6)
- activejob (= 6.1.4.6)
- activerecord (= 6.1.4.6)
- activesupport (= 6.1.4.6)
+ activestorage (6.1.4.7)
+ actionpack (= 6.1.4.7)
+ activejob (= 6.1.4.7)
+ activerecord (= 6.1.4.7)
+ activesupport (= 6.1.4.7)
marcel (~> 1.0.0)
mini_mime (>= 1.1.0)
- activesupport (6.1.4.6)
+ activesupport (6.1.4.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@@ -89,7 +89,7 @@ GEM
faraday_middleware-multi_json (~> 0.0)
oauth2 (~> 1.4)
asciidoctor (2.0.15)
- asciidoctor-include-ext (0.3.1)
+ asciidoctor-include-ext (0.4.0)
asciidoctor (>= 1.5.6, < 3.0.0)
asciidoctor-kroki (0.5.0)
asciidoctor (~> 2.0)
@@ -137,7 +137,7 @@ GEM
base32 (0.3.2)
batch-loader (2.0.1)
bcrypt (3.1.16)
- benchmark (0.1.1)
+ benchmark (0.2.0)
benchmark-ips (2.3.0)
benchmark-malloc (0.2.0)
benchmark-memory (0.1.2)
@@ -203,7 +203,7 @@ GEM
coderay (1.1.3)
colored2 (3.1.2)
commonmarker (0.23.4)
- concurrent-ruby (1.1.9)
+ concurrent-ruby (1.1.10)
connection_pool (2.2.5)
contracts (0.11.0)
cork (0.3.0)
@@ -224,7 +224,7 @@ GEM
css_parser (1.7.0)
addressable
daemons (1.3.1)
- danger (8.4.5)
+ danger (8.5.0)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
@@ -455,7 +455,7 @@ GEM
rails (>= 3.2.0)
git (1.7.0)
rchardet (~> 1.8)
- gitaly (14.9.0.pre.rc4)
+ gitaly (14.10.0.pre.rc1)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab (4.16.1)
@@ -463,10 +463,11 @@ GEM
terminal-table (~> 1.5, >= 1.5.1)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
- gitlab-dangerfiles (2.11.0)
+ gitlab-dangerfiles (3.0.0)
danger (>= 8.4.5)
danger-gitlab (>= 8.0.0)
- gitlab-experiment (0.7.0)
+ rake
+ gitlab-experiment (0.7.1)
activesupport (>= 3.0)
request_store (>= 1.0)
gitlab-fog-azure-rm (1.2.0)
@@ -533,7 +534,7 @@ GEM
signet (~> 0.12)
google-cloud-env (1.5.0)
faraday (>= 0.17.3, < 2.0)
- google-protobuf (3.19.1)
+ google-protobuf (3.19.4)
googleapis-common-protos-types (1.3.0)
google-protobuf (~> 3.14)
googleauth (0.14.0)
@@ -654,7 +655,7 @@ GEM
invisible_captcha (1.1.0)
rails (>= 4.2)
ipaddress (0.8.3)
- ipynbdiff (0.4.4)
+ ipynbdiff (0.4.5)
diffy (~> 3.3)
json (~> 2.5, >= 2.5.1)
jaeger-client (1.1.0)
@@ -736,7 +737,7 @@ GEM
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
- loofah (2.12.0)
+ loofah (2.16.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lru_redux (1.1.0)
@@ -755,8 +756,8 @@ GEM
mime-types-data (3.2020.0512)
mini_histogram (0.3.1)
mini_magick (4.10.1)
- mini_mime (1.1.1)
- mini_portile2 (2.6.1)
+ mini_mime (1.1.2)
+ mini_portile2 (2.8.0)
minitest (5.11.3)
mixlib-cli (2.1.8)
mixlib-config (3.0.9)
@@ -794,8 +795,8 @@ GEM
netrc (0.11.0)
nio4r (2.5.8)
no_proxy_fix (0.1.2)
- nokogiri (1.12.5)
- mini_portile2 (~> 2.6.1)
+ nokogiri (1.13.3)
+ mini_portile2 (~> 2.8.0)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)
@@ -828,6 +829,8 @@ GEM
omniauth (1.9.1)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
+ omniauth-alicloud (1.0.1)
+ omniauth-oauth2 (~> 1.7.1)
omniauth-atlassian-oauth2 (0.2.0)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.5)
@@ -968,25 +971,25 @@ GEM
httpclient
json-jwt (>= 1.11.0)
rack (>= 2.1.0)
- rack-proxy (0.6.0)
+ rack-proxy (0.7.2)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack-timeout (0.5.2)
- rails (6.1.4.6)
- actioncable (= 6.1.4.6)
- actionmailbox (= 6.1.4.6)
- actionmailer (= 6.1.4.6)
- actionpack (= 6.1.4.6)
- actiontext (= 6.1.4.6)
- actionview (= 6.1.4.6)
- activejob (= 6.1.4.6)
- activemodel (= 6.1.4.6)
- activerecord (= 6.1.4.6)
- activestorage (= 6.1.4.6)
- activesupport (= 6.1.4.6)
+ rails (6.1.4.7)
+ actioncable (= 6.1.4.7)
+ actionmailbox (= 6.1.4.7)
+ actionmailer (= 6.1.4.7)
+ actionpack (= 6.1.4.7)
+ actiontext (= 6.1.4.7)
+ actionview (= 6.1.4.7)
+ activejob (= 6.1.4.7)
+ activemodel (= 6.1.4.7)
+ activerecord (= 6.1.4.7)
+ activestorage (= 6.1.4.7)
+ activesupport (= 6.1.4.7)
bundler (>= 1.15.0)
- railties (= 6.1.4.6)
+ railties (= 6.1.4.7)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
@@ -1000,9 +1003,9 @@ GEM
rails-i18n (6.0.0)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 7)
- railties (6.1.4.6)
- actionpack (= 6.1.4.6)
- activesupport (= 6.1.4.6)
+ railties (6.1.4.7)
+ actionpack (= 6.1.4.7)
+ activesupport (= 6.1.4.7)
method_source
rake (>= 0.13)
thor (~> 1.0)
@@ -1206,7 +1209,7 @@ GEM
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
- simple_po_parser (1.1.2)
+ simple_po_parser (1.1.6)
simplecov (0.21.2)
docile (~> 1.1)
simplecov-html (~> 0.11)
@@ -1220,7 +1223,7 @@ GEM
slack-messenger (2.3.4)
snowplow-tracker (0.6.1)
contracts (~> 0.7, <= 0.11)
- solargraph (0.43.0)
+ solargraph (0.44.3)
backport (~> 1.2)
benchmark
bundler (>= 1.17.2)
@@ -1247,11 +1250,11 @@ GEM
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- sprockets-rails (3.2.2)
- actionpack (>= 4.0)
- activesupport (>= 4.0)
+ sprockets-rails (3.4.2)
+ actionpack (>= 5.2)
+ activesupport (>= 5.2)
sprockets (>= 3.0.0)
- sqlite3 (1.3.13)
+ sqlite3 (1.4.2)
ssh_data (1.2.0)
ssrf_filter (1.0.7)
stackprof (0.2.15)
@@ -1417,7 +1420,7 @@ DEPENDENCIES
apollo_upload_server (~> 2.1.0)
asana (~> 0.10.3)
asciidoctor (~> 2.0.10)
- asciidoctor-include-ext (~> 0.3.1)
+ asciidoctor-include-ext (~> 0.4.0)
asciidoctor-kroki (~> 0.5.0)
asciidoctor-plantuml (~> 0.0.12)
atlassian-jwt (~> 0.2.0)
@@ -1491,11 +1494,11 @@ DEPENDENCIES
gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly (~> 14.9.0.pre.rc4)
+ gitaly (~> 14.10.0.pre.rc1)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
- gitlab-dangerfiles (~> 2.11.0)
- gitlab-experiment (~> 0.7.0)
+ gitlab-dangerfiles (~> 3.0)
+ gitlab-experiment (~> 0.7.1)
gitlab-fog-azure-rm (~> 1.2.0)
gitlab-labkit (~> 0.22.0)
gitlab-license (~> 2.1.0)
@@ -1535,7 +1538,7 @@ DEPENDENCIES
icalendar
invisible_captcha (~> 1.1.0)
ipaddress (~> 0.8.3)
- ipynbdiff (= 0.4.4)
+ ipynbdiff (= 0.4.5)
jira-ruby (~> 2.1.4)
js_regex (~> 3.7)
json (~> 2.5.1)
@@ -1569,6 +1572,7 @@ DEPENDENCIES
ohai (~> 16.10)
oj (~> 3.10.6)
omniauth (~> 1.8)
+ omniauth-alicloud (~> 1.0.1)
omniauth-atlassian-oauth2 (~> 0.2.0)
omniauth-auth0 (~> 2.0.0)
omniauth-authentiq (~> 0.3.3)
@@ -1605,9 +1609,9 @@ DEPENDENCIES
rack-attack (~> 6.3.0)
rack-cors (~> 1.0.6)
rack-oauth2 (~> 1.16.0)
- rack-proxy (~> 0.6.0)
+ rack-proxy (~> 0.7.2)
rack-timeout (~> 0.5.1)
- rails (~> 6.1.4.6)
+ rails (~> 6.1.4.7)
rails-controller-testing
rails-i18n (~> 6.0)
rainbow (~> 3.0)
@@ -1652,13 +1656,13 @@ DEPENDENCIES
sidekiq (~> 6.4)
sidekiq-cron (~> 1.2)
sigdump (~> 0.2.4)
- simple_po_parser (~> 1.1.2)
+ simple_po_parser (~> 1.1.6)
simplecov (~> 0.21)
simplecov-cobertura (~> 1.3.1)
simplecov-lcov (~> 0.8.0)
slack-messenger (~> 2.3.4)
snowplow-tracker (~> 0.6.1)
- solargraph (~> 0.43)
+ solargraph (~> 0.44.3)
spamcheck (~> 0.1.0)
spring (~> 2.1.0)
spring-commands-rspec (~> 1.0.4)