From cde5f32d6153ae5caa0869464cd1046577ca39ec Mon Sep 17 00:00:00 2001 From: David Miller Date: Mon, 12 Dec 2016 15:42:44 -0500 Subject: [PATCH] Bugfix resourceUrlWhitelist for amazonS3 using inline annotation Why? ---- * Adding s3amazon to `resourceUrlWhitelist` config was not minsafe and was breaking on production How? ---- * Convert config to use inline annotation. * Bump gem ver to `0.3.1` --- app/assets/javascripts/atomic_cms.js | 4 ++-- atomic_cms.gemspec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/atomic_cms.js b/app/assets/javascripts/atomic_cms.js index 0864d79..23ad822 100644 --- a/app/assets/javascripts/atomic_cms.js +++ b/app/assets/javascripts/atomic_cms.js @@ -39,12 +39,12 @@ page = angular.module('page', ['markdown', 'ngSanitize']); - page.config(function($sceDelegateProvider) { + page.config(['$sceDelegateProvider', function($sceDelegateProvider) { $sceDelegateProvider.resourceUrlWhitelist([ 'self', 'http://s3.amazonaws.com/**' ]); - }); + }]); page.filter('vimeo_url', [ '$sce', function($sce) { diff --git a/atomic_cms.gemspec b/atomic_cms.gemspec index 37ce4e7..55bf465 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.0' + s.version = '0.3.1' s.summary = 'Atomic CMS' s.description = 'Live CMS powered by atomic assets.' s.authors = ['Don Humphreys', 'Spartan']