Skip to content

Commit

Permalink
Merge pull request #53 from spartansystems/bugfix/minsafe-url-whitelist
Browse files Browse the repository at this point in the history
Bugfix resourceUrlWhitelist for amazonS3 using inline annotation
  • Loading branch information
davidmiller11 authored Dec 12, 2016
2 parents d5a9a68 + cde5f32 commit 8b39df9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/assets/javascripts/atomic_cms.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion atomic_cms.gemspec
Original file line number Diff line number Diff line change
@@ -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']
Expand Down

0 comments on commit 8b39df9

Please sign in to comment.