Merge pull request #54 from spartansystems/bugfix/add-s3-https-url

Add SSL link for s3 to resourceUrlWhitelist
verypossible · Dec 12, 2016 · 943b4eb · 943b4eb
2 parents 8b39df9 + f1c5b05
commit 943b4eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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']