From f1c5b05cb453af3bf7b0378eb9ff3527c79f9610 Mon Sep 17 00:00:00 2001 From: David Miller Date: Mon, 12 Dec 2016 16:41:58 -0500 Subject: [PATCH] Add SSL link for s3 to resourceUrlWhitelist Why? ---- * Angular's `resourceUrlWhitelist` needs an https url in order to support production sites using SSL How? ---- * Add additional whitelisted url for s3 * Bump gem version --- app/assets/javascripts/atomic_cms.js | 5 +++-- atomic_cms.gemspec | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/atomic_cms.js b/app/assets/javascripts/atomic_cms.js index 23ad822..5e7b0a1 100644 --- a/app/assets/javascripts/atomic_cms.js +++ b/app/assets/javascripts/atomic_cms.js @@ -41,8 +41,9 @@ page.config(['$sceDelegateProvider', function($sceDelegateProvider) { $sceDelegateProvider.resourceUrlWhitelist([ - 'self', - 'http://s3.amazonaws.com/**' + 'self', + 'http://s3.amazonaws.com/**', + 'https://s3.amazonaws.com/**' ]); }]); diff --git a/atomic_cms.gemspec b/atomic_cms.gemspec index 55bf465..e94b1f5 100644 --- a/atomic_cms.gemspec +++ b/atomic_cms.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'atomic_cms' - s.version = '0.3.1' + s.version = '0.3.2' s.summary = 'Atomic CMS' s.description = 'Live CMS powered by atomic assets.' s.authors = ['Don Humphreys', 'Spartan']