summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-22 18:06:35 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-22 18:06:35 +0000
commit24fe7aa2aa199b2aace0cfec26d744f51d7e2167 (patch)
tree65eea9b7eba812dc2636aba1bfc885f12d38f774 /Gemfile
parent6653aab95dfdfd260e8814e7499cc2345f451f99 (diff)
downloadgitlab-ce-24fe7aa2aa199b2aace0cfec26d744f51d7e2167.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 05c35df878f..c0e31fb6c5c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -455,9 +455,9 @@ gem 'google-protobuf', '~> 3.8.0'
gem 'toml-rb', '~> 1.0.0', require: false
# Feature toggles
-gem 'flipper', '~> 0.13.0'
-gem 'flipper-active_record', '~> 0.13.0'
-gem 'flipper-active_support_cache_store', '~> 0.13.0'
+gem 'flipper', '~> 0.17.1'
+gem 'flipper-active_record', '~> 0.17.1'
+gem 'flipper-active_support_cache_store', '~> 0.17.1'
gem 'unleash', '~> 0.1.5'
# Structured logging