diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-16 13:43:42 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-16 13:43:42 +0000 |
| commit | e79f3728edddaa37c678db11824edbf4f01db63e (patch) | |
| tree | a3f19ed6c85d86e95613793b584b2d0afc93eebc | |
| parent | ddda94c3a4a4cd08be0014d8d816beeebd405f51 (diff) | |
| parent | c3dc761e02da345d568f36e4a59fbcd39fe0a292 (diff) | |
| download | gitlab-ce-e79f3728edddaa37c678db11824edbf4f01db63e.tar.gz | |
Merge branch 'update-flipper' into 'master'
Update flipper 0.11.0 -> 0.13.0
See merge request gitlab-org/gitlab-ce!17722
| -rw-r--r-- | Gemfile | 6 | ||||
| -rw-r--r-- | Gemfile.lock | 16 |
2 files changed, 11 insertions, 11 deletions
@@ -420,9 +420,9 @@ gem 'google-protobuf', '= 3.5.1' gem 'toml-rb', '~> 1.0.0', require: false # Feature toggles -gem 'flipper', '~> 0.11.0' -gem 'flipper-active_record', '~> 0.11.0' -gem 'flipper-active_support_cache_store', '~> 0.11.0' +gem 'flipper', '~> 0.13.0' +gem 'flipper-active_record', '~> 0.13.0' +gem 'flipper-active_support_cache_store', '~> 0.13.0' # Structured logging gem 'lograge', '~> 0.5' diff --git a/Gemfile.lock b/Gemfile.lock index 8a0da87ba7e..1dd8576e30b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -218,13 +218,13 @@ GEM path_expander (~> 1.0) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flipper (0.11.0) - flipper-active_record (0.11.0) + flipper (0.13.0) + flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) - flipper (~> 0.11.0) - flipper-active_support_cache_store (0.11.0) + flipper (~> 0.13.0) + flipper-active_support_cache_store (0.13.0) activesupport (>= 3.2, < 6) - flipper (~> 0.11.0) + flipper (~> 0.13.0) flowdock (0.7.1) httparty (~> 0.7) multi_json @@ -1039,9 +1039,9 @@ DEPENDENCIES fast_blank ffaker (~> 2.4) flay (~> 2.10.0) - flipper (~> 0.11.0) - flipper-active_record (~> 0.11.0) - flipper-active_support_cache_store (~> 0.11.0) + flipper (~> 0.13.0) + flipper-active_record (~> 0.13.0) + flipper-active_support_cache_store (~> 0.13.0) fog-aliyun (~> 0.2.0) fog-aws (~> 2.0) fog-core (~> 1.44) |