diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-12 18:11:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-12 18:11:09 +0000 |
| commit | 60eaf3d90650086dedb6fd94d6169dc5ab1f8d1e (patch) | |
| tree | ff943955f1c424787ba65ff7c1607c522c103115 /Gemfile.lock | |
| parent | 1c8734ca5c2981e62b9c1162851ed136de86bbbf (diff) | |
| download | gitlab-ce-60eaf3d90650086dedb6fd94d6169dc5ab1f8d1e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1190dd4bf8c..3b8bdd23647 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -438,13 +438,13 @@ GEM libyajl2 (~> 1.2) filelock (1.1.1) find_a_port (1.0.1) - flipper (0.21.0) - flipper-active_record (0.21.0) - activerecord (>= 5.0, < 7) - flipper (~> 0.21.0) - flipper-active_support_cache_store (0.21.0) - activesupport (>= 5.0, < 7) - flipper (~> 0.21.0) + flipper (0.25.0) + flipper-active_record (0.25.0) + activerecord (>= 4.2, < 8) + flipper (~> 0.25.0) + flipper-active_support_cache_store (0.25.0) + activesupport (>= 4.2, < 8) + flipper (~> 0.25.0) flowdock (0.7.1) httparty (~> 0.7) multi_json @@ -1557,9 +1557,9 @@ DEPENDENCIES faraday_middleware-aws-sigv4 (~> 0.3.0) fast_blank ffaker (~> 2.10) - flipper (~> 0.21.0) - flipper-active_record (~> 0.21.0) - flipper-active_support_cache_store (~> 0.21.0) + flipper (~> 0.25.0) + flipper-active_record (~> 0.25.0) + flipper-active_support_cache_store (~> 0.25.0) flowdock (~> 0.7) fog-aliyun (~> 0.3) fog-aws (~> 3.14) |