Merge branch 'update-flipper' into 'master'
Update flipper 0.11.0 -> 0.13.0 See merge request gitlab-org/gitlab-ce!17722
This commit is contained in:
commit
e79f3728ed
6
Gemfile
6
Gemfile
|
@ -420,9 +420,9 @@ gem 'google-protobuf', '= 3.5.1'
|
||||||
gem 'toml-rb', '~> 1.0.0', require: false
|
gem 'toml-rb', '~> 1.0.0', require: false
|
||||||
|
|
||||||
# Feature toggles
|
# Feature toggles
|
||||||
gem 'flipper', '~> 0.11.0'
|
gem 'flipper', '~> 0.13.0'
|
||||||
gem 'flipper-active_record', '~> 0.11.0'
|
gem 'flipper-active_record', '~> 0.13.0'
|
||||||
gem 'flipper-active_support_cache_store', '~> 0.11.0'
|
gem 'flipper-active_support_cache_store', '~> 0.13.0'
|
||||||
|
|
||||||
# Structured logging
|
# Structured logging
|
||||||
gem 'lograge', '~> 0.5'
|
gem 'lograge', '~> 0.5'
|
||||||
|
|
16
Gemfile.lock
16
Gemfile.lock
|
@ -218,13 +218,13 @@ GEM
|
||||||
path_expander (~> 1.0)
|
path_expander (~> 1.0)
|
||||||
ruby_parser (~> 3.0)
|
ruby_parser (~> 3.0)
|
||||||
sexp_processor (~> 4.0)
|
sexp_processor (~> 4.0)
|
||||||
flipper (0.11.0)
|
flipper (0.13.0)
|
||||||
flipper-active_record (0.11.0)
|
flipper-active_record (0.13.0)
|
||||||
activerecord (>= 3.2, < 6)
|
activerecord (>= 3.2, < 6)
|
||||||
flipper (~> 0.11.0)
|
flipper (~> 0.13.0)
|
||||||
flipper-active_support_cache_store (0.11.0)
|
flipper-active_support_cache_store (0.13.0)
|
||||||
activesupport (>= 3.2, < 6)
|
activesupport (>= 3.2, < 6)
|
||||||
flipper (~> 0.11.0)
|
flipper (~> 0.13.0)
|
||||||
flowdock (0.7.1)
|
flowdock (0.7.1)
|
||||||
httparty (~> 0.7)
|
httparty (~> 0.7)
|
||||||
multi_json
|
multi_json
|
||||||
|
@ -1039,9 +1039,9 @@ DEPENDENCIES
|
||||||
fast_blank
|
fast_blank
|
||||||
ffaker (~> 2.4)
|
ffaker (~> 2.4)
|
||||||
flay (~> 2.10.0)
|
flay (~> 2.10.0)
|
||||||
flipper (~> 0.11.0)
|
flipper (~> 0.13.0)
|
||||||
flipper-active_record (~> 0.11.0)
|
flipper-active_record (~> 0.13.0)
|
||||||
flipper-active_support_cache_store (~> 0.11.0)
|
flipper-active_support_cache_store (~> 0.13.0)
|
||||||
fog-aliyun (~> 0.2.0)
|
fog-aliyun (~> 0.2.0)
|
||||||
fog-aws (~> 2.0)
|
fog-aws (~> 2.0)
|
||||||
fog-core (~> 1.44)
|
fog-core (~> 1.44)
|
||||||
|
|
Loading…
Reference in New Issue