Merge pull request #379 from cul-it/update/2.13.0

remove cloudfront; remove featured_pages_block override
cul-it · Nov 5, 2020 · d72fa54 · d72fa54
2 parents bedb6c3 + fdef54c
commit d72fa54
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 2.17.10 (2020-11-05)
+
+* CloudFront requires more testing -- removed
+* remove override of featured_pages_block - problem fixed in spotlight
+
 ### 2.17.9 (2020-09-18)
 
 * setup CloudFront pre-loading of assets

diff --git a/app/models/sir_trevor_rails/blocks/featured_pages_block.rb b/app/models/sir_trevor_rails/blocks/featured_pages_block.rb
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -28,7 +28,7 @@
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  config.action_controller.asset_host = ENV['CLOUDFRONT_ENDPOINT']
+  # config.action_controller.asset_host = ENV['CLOUDFRONT_ENDPOINT']
 
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache

diff --git a/lib/version.rb b/lib/version.rb
@@ -1,3 +1,3 @@
 module Version
-  VERSION = "v2.17.9".freeze
+  VERSION = "v2.17.10".freeze
 end