actionpack-cloudfront 1.1.0 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -10,7 +10,9 @@ module ActionPack
10
10
  config.before_initialize do |app|
11
11
  if app.config.action_pack_cloudfront.load_proxies
12
12
  trusted_proxies = ActionPack::Cloudfront::IpRanges.trusted_proxies
13
- app.config.action_dispatch.trusted_proxies = trusted_proxies
13
+ existing_proxies = Array(app.config.action_dispatch.trusted_proxies)
14
+
15
+ app.config.action_dispatch.trusted_proxies = trusted_proxies.concat(existing_proxies).uniq
14
16
  end
15
17
  end
16
18
 
@@ -1,5 +1,5 @@
1
1
  module ActionPack
2
2
  module Cloudfront
3
- VERSION = '1.1.0'.freeze
3
+ VERSION = '1.2.0'.freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: actionpack-cloudfront
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ken Collins
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-03-29 00:00:00.000000000 Z
11
+ date: 2021-11-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionpack