diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-02 15:07:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-02 15:07:21 +0300 |
commit | ecdd26856c46b1e9e0c500701b36b6ae338e18a0 (patch) | |
tree | 642908c4245e3c29936fa56ef24f7b95177faf3f /Gemfile.lock | |
parent | 885a1dc7570fc428ff0a9271af9956c59760721b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b66a7b42972..ce3408a1cf4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -501,7 +501,7 @@ GEM jwt (>= 2.5) dotenv (2.7.6) dry-cli (1.0.0) - dry-core (1.0.1) + dry-core (1.0.0) concurrent-ruby (~> 1.0) zeitwerk (~> 2.6) dry-inflector (1.0.0) @@ -815,24 +815,23 @@ GEM signet (>= 0.16, < 2.a) gpgme (2.0.23) mini_portile2 (~> 2.7) - grape (2.0.0) - activesupport (>= 5) + grape (1.7.1) + activesupport builder dry-types (>= 1.1) mustermann-grape (~> 1.0.0) - rack (>= 1.3.0) + rack (>= 1.3.0, < 3) rack-accept grape-entity (0.10.0) activesupport (>= 3.0.0) multi_json (>= 1.3.2) - grape-path-helpers (2.0.1) + grape-path-helpers (1.7.1) activesupport - grape (~> 2.0) + grape (~> 1.3) rake (> 12) ruby2_keywords (~> 0.0.2) - grape-swagger (2.0.0) - grape (>= 1.7, < 3.0) - rack-test (~> 2) + grape-swagger (1.6.1) + grape (~> 1.3) grape-swagger-entity (0.5.1) grape-entity (>= 0.6.0) grape-swagger (>= 1.2.0) @@ -1922,10 +1921,10 @@ DEPENDENCIES google-cloud-storage (~> 1.45.0) google-protobuf (~> 3.25, >= 3.25.1) gpgme (~> 2.0.23) - grape (~> 2.0.0) + grape (~> 1.7.1) grape-entity (~> 0.10.0) - grape-path-helpers (~> 2.0.0) - grape-swagger (~> 2.0.0) + grape-path-helpers (~> 1.7.1) + grape-swagger (~> 1.6.1) grape-swagger-entity (~> 0.5.1) grape_logging (~> 1.8) graphiql-rails (~> 1.8.0) |