nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Dennis Schubert 2018-11-08 05:14:36 +01:00
commit cd16f29c39
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -24,6 +24,7 @@
## Bug fixes ## Bug fixes
* Ignore invalid URLs for camo [#7922](https://github.com/diaspora/diaspora/pull/7922) * Ignore invalid URLs for camo [#7922](https://github.com/diaspora/diaspora/pull/7922)
* Unlinking a post did not update the participation icon without a reload [#7882](https://github.com/diaspora/diaspora/pull/7882) * Unlinking a post did not update the participation icon without a reload [#7882](https://github.com/diaspora/diaspora/pull/7882)
* Fix broken Instagram embedding [#7920](https://github.com/diaspora/diaspora/pull/7920)
## Features ## Features
* Add the ability to assign roles in the admin panel [#7868](https://github.com/diaspora/diaspora/pull/7868) * Add the ability to assign roles in the admin panel [#7868](https://github.com/diaspora/diaspora/pull/7868)

2
config/initializers/secure_headers.rb
View file

@ -16,7 +16,7 @@ SecureHeaders::Configuration.default do |config|
img_src: %w['self' data: blob: *], img_src: %w['self' data: blob: *],
media_src: %w[https:], media_src: %w[https:],
script_src: %w['self' blob: 'unsafe-eval' platform.twitter.com cdn.syndication.twimg.com widgets.flickr.com script_src: %w['self' blob: 'unsafe-eval' platform.twitter.com cdn.syndication.twimg.com widgets.flickr.com
embedr.flickr.com platform.instagram.com 'unsafe-inline'], embedr.flickr.com www.instagram.com 'unsafe-inline'],
style_src: %w['self' 'unsafe-inline' platform.twitter.com *.twimg.com] style_src: %w['self' 'unsafe-inline' platform.twitter.com *.twimg.com]
} }
# rubocop:enable Lint/PercentStringArray # rubocop:enable Lint/PercentStringArray