diff --git a/Gemfile b/Gemfile index 22a513e70..a50d1d62f 100644 --- a/Gemfile +++ b/Gemfile @@ -43,9 +43,9 @@ gem "fastly", "~> 2.5" # Client library for the Fastly acceleration system gem "feedjira", "~> 3.1" # A feed fetching and parsing library gem "field_test", "~> 0.3" # A/B testing gem "figaro", "~> 1.2" # Simple, Heroku-friendly Rails app configuration using ENV and a single YAML file -gem "flipper", "~> 0.17.2" # Feature flipping / flags for Ruby -gem "flipper-active_record", "~> 0.17.2" # Store Flipper flags in ActiveRecord -gem "flipper-ui", "~> 0.17.2" +gem "flipper", "~> 0.18.0" # Feature flipping / flags for Ruby +gem "flipper-active_record", "~> 0.18.0" # Store Flipper flags in ActiveRecord +gem "flipper-ui", "~> 0.18.0" gem "fog-aws", "~> 3.6" # 'fog' gem to support Amazon Web Services gem "front_matter_parser", "~> 0.2" # Parse a front matter from syntactically correct strings or files gem "gemoji", "~> 4.0.0.rc2" # Character information and metadata for standard and custom emoji diff --git a/Gemfile.lock b/Gemfile.lock index 85269d472..1fe3f9b6c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -351,13 +351,13 @@ GEM thor (>= 0.14.0, < 2) fix-db-schema-conflicts (3.0.3) rubocop (>= 0.38.0) - flipper (0.17.2) - flipper-active_record (0.17.2) - activerecord (>= 4.2, < 7) - flipper (~> 0.17.2) - flipper-ui (0.17.2) + flipper (0.18.0) + flipper-active_record (0.18.0) + activerecord (>= 5.0, < 7) + flipper (~> 0.18.0) + flipper-ui (0.18.0) erubi (>= 1.0.0, < 2.0.0) - flipper (~> 0.17.2) + flipper (~> 0.18.0) rack (>= 1.4, < 3) rack-protection (>= 1.5.3, < 2.1.0) fog-aws (3.6.6) @@ -930,9 +930,9 @@ DEPENDENCIES field_test (~> 0.3) figaro (~> 1.2) fix-db-schema-conflicts (~> 3.0) - flipper (~> 0.17.2) - flipper-active_record (~> 0.17.2) - flipper-ui (~> 0.17.2) + flipper (~> 0.18.0) + flipper-active_record (~> 0.18.0) + flipper-ui (~> 0.18.0) fog-aws (~> 3.6) front_matter_parser (~> 0.2) gemoji (~> 4.0.0.rc2) diff --git a/config/initializers/flipper.rb b/config/initializers/flipper.rb index 1a1a5e565..d4dd55d9a 100644 --- a/config/initializers/flipper.rb +++ b/config/initializers/flipper.rb @@ -7,9 +7,3 @@ Flipper.configure do |config| Flipper.new(adapter) end end - -Flipper::UI.configure do |config| - # Provide guidance on format for user ids - config.actors.title = "Actor (ex: User:123)" - config.actors.description = "ex: User:123" -end diff --git a/vendor/cache/flipper-0.17.2.gem b/vendor/cache/flipper-0.17.2.gem deleted file mode 100644 index b6252216c..000000000 Binary files a/vendor/cache/flipper-0.17.2.gem and /dev/null differ diff --git a/vendor/cache/flipper-0.18.0.gem b/vendor/cache/flipper-0.18.0.gem new file mode 100644 index 000000000..a81f55cbf Binary files /dev/null and b/vendor/cache/flipper-0.18.0.gem differ diff --git a/vendor/cache/flipper-active_record-0.17.2.gem b/vendor/cache/flipper-active_record-0.17.2.gem deleted file mode 100644 index 3e353597a..000000000 Binary files a/vendor/cache/flipper-active_record-0.17.2.gem and /dev/null differ diff --git a/vendor/cache/flipper-active_record-0.18.0.gem b/vendor/cache/flipper-active_record-0.18.0.gem new file mode 100644 index 000000000..a19244e04 Binary files /dev/null and b/vendor/cache/flipper-active_record-0.18.0.gem differ diff --git a/vendor/cache/flipper-ui-0.17.2.gem b/vendor/cache/flipper-ui-0.17.2.gem deleted file mode 100644 index 796345d87..000000000 Binary files a/vendor/cache/flipper-ui-0.17.2.gem and /dev/null differ diff --git a/vendor/cache/flipper-ui-0.18.0.gem b/vendor/cache/flipper-ui-0.18.0.gem new file mode 100644 index 000000000..a5038c99e Binary files /dev/null and b/vendor/cache/flipper-ui-0.18.0.gem differ