diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-07 12:10:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-07 12:10:00 +0000 |
| commit | de8e5077c3671b0b29642faf1b5e562bc4f99453 (patch) | |
| tree | 315d59367b7ff609ed4293f369c14be9e7e91cba /Gemfile.lock | |
| parent | f4c6fbb86fbec3e5917e317b3490232d98531881 (diff) | |
| download | gitlab-ce-de8e5077c3671b0b29642faf1b5e562bc4f99453.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 59cbd84a3e6..06dfaccac3d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -376,13 +376,13 @@ GEM rake ffi-yajl (2.3.4) libyajl2 (~> 1.2) - flipper (0.17.1) - flipper-active_record (0.17.1) - activerecord (>= 4.2, < 7) - flipper (~> 0.17.1) - flipper-active_support_cache_store (0.17.1) - activesupport (>= 4.2, < 7) - flipper (~> 0.17.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) flowdock (0.7.1) httparty (~> 0.7) multi_json @@ -1453,9 +1453,9 @@ DEPENDENCIES faraday_middleware-aws-sigv4 (~> 0.3.0) fast_blank ffaker (~> 2.10) - flipper (~> 0.17.1) - flipper-active_record (~> 0.17.1) - flipper-active_support_cache_store (~> 0.17.1) + flipper (~> 0.21.0) + flipper-active_record (~> 0.21.0) + flipper-active_support_cache_store (~> 0.21.0) flowdock (~> 0.7) fog-aliyun (~> 0.3) fog-aws (~> 3.9) |