summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-10-18 12:09:21 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-10-18 12:09:21 +0000
commita300f4d5c7fdd5d557288ee526986e0adb683b35 (patch)
tree8fb18970393c8b4e3b9681262b0318db00f7ba51 /Gemfile.lock
parent7bbc9509dc0567d2a2d8314e99179aaad33ba361 (diff)
downloadgitlab-ce-a300f4d5c7fdd5d557288ee526986e0adb683b35.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock31
1 files changed, 16 insertions, 15 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 9d0d013037d..24e4c532f08 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -420,6 +420,8 @@ GEM
ffi (>= 1.15.0)
excon (0.90.0)
execjs (2.8.1)
+ expgen (0.1.1)
+ parslet
expression_parser (0.9.0)
extended-markdown-filter (0.6.0)
html-pipeline (~> 2.0)
@@ -999,29 +1001,29 @@ GEM
rubypants (~> 0.2)
orm_adapter (0.5.0)
os (1.1.1)
- pact (1.59.0)
+ pact (1.63.0)
pact-mock_service (~> 3.0, >= 3.3.1)
- pact-support (~> 1.15)
- rack-test (>= 0.6.3, < 2.0.0)
+ pact-support (~> 1.16, >= 1.16.9)
+ rack-test (>= 0.6.3, < 3.0.0)
rspec (~> 3.0)
term-ansicolor (~> 1.0)
thor (>= 0.20, < 2.0)
webrick (~> 1.3)
- pact-mock_service (3.6.2)
+ pact-mock_service (3.10.0)
filelock (~> 1.1)
find_a_port (~> 1.0.1)
json
- pact-support (~> 1.12, >= 1.12.0)
+ pact-support (~> 1.16, >= 1.16.4)
rack (~> 2.0)
rspec (>= 2.14)
term-ansicolor (~> 1.0)
thor (>= 0.19, < 2.0)
webrick (~> 1.3)
- pact-support (1.15.1)
- awesome_print (~> 1.1)
- randexp (~> 0.1.7)
- rspec (>= 2.14)
- term-ansicolor (~> 1.0)
+ pact-support (1.18.1)
+ awesome_print (~> 1.9)
+ diff-lcs (~> 1.4)
+ expgen (~> 0.1)
+ rainbow (~> 3.1.1)
parallel (1.22.1)
parser (3.1.2.1)
ast (~> 2.4.1)
@@ -1087,8 +1089,8 @@ GEM
rack
rack-proxy (0.7.4)
rack
- rack-test (1.1.0)
- rack (>= 1.0, < 3)
+ rack-test (2.0.2)
+ rack (>= 1.3)
rack-timeout (0.6.3)
rails (6.1.6.1)
actioncable (= 6.1.6.1)
@@ -1125,7 +1127,6 @@ GEM
thor (~> 1.0)
rainbow (3.1.1)
rake (13.0.6)
- randexp (0.1.7)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
@@ -1415,7 +1416,7 @@ GEM
timecop (0.9.1)
timeliness (0.3.10)
timfel-krb5-auth (0.8.3)
- tins (1.31.0)
+ tins (1.31.1)
sync
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
@@ -1725,7 +1726,7 @@ DEPENDENCIES
omniauth_crowd (~> 2.4.0)!
openssl (= 2.2.1)
org-ruby (~> 0.9.12)
- pact (~> 1.12)
+ pact (~> 1.63)
parallel (~> 1.19)
parslet (~> 1.8)
peek (~> 1.1)