actionpack-cloudfront 1.1.0 → 1.2.0

data/lib/action_pack/cloudfront/railtie.rb

@@ -10,7 +10,9 @@ module ActionPack
       config.before_initialize do |app|
         if app.config.action_pack_cloudfront.load_proxies
           trusted_proxies = ActionPack::Cloudfront::IpRanges.trusted_proxies
-          app.config.action_dispatch.trusted_proxies = trusted_proxies
+          existing_proxies = Array(app.config.action_dispatch.trusted_proxies)
+
+          app.config.action_dispatch.trusted_proxies = trusted_proxies.concat(existing_proxies).uniq
         end
       end
 

data/lib/action_pack/cloudfront/version.rb

@@ -1,5 +1,5 @@
 module ActionPack
   module Cloudfront
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionpack-cloudfront
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack