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:
Benjamin Neff 2018-06-16 01:23:10 +02:00
commit 212da3a2b7
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog.md
View file

@ -18,6 +18,8 @@
* Handle duplicates for TagFollowing on account merging [#7807](https://github.com/diaspora/diaspora/pull/7807) * Handle duplicates for TagFollowing on account merging [#7807](https://github.com/diaspora/diaspora/pull/7807)
## Bug fixes ## Bug fixes
* Fix compatibility with newer glibc versions [#7828](https://github.com/diaspora/diaspora/pull/7828)
* Allow fonts to be served from asset host in CSP [#7825](https://github.com/diaspora/diaspora/pull/7825)
## Features ## Features

4
Gemfile.lock
View file

@ -353,7 +353,7 @@ GEM
to_regexp (~> 0.2.1) to_regexp (~> 0.2.1)
jwt (1.5.6) jwt (1.5.6)
kgio (2.11.2) kgio (2.11.2)
kostya-sigar (2.0.0) kostya-sigar (2.0.4)
leaflet-rails (1.3.1) leaflet-rails (1.3.1)
rails (>= 4.2.0) rails (>= 4.2.0)
listen (3.1.5) listen (3.1.5)
@ -921,4 +921,4 @@ DEPENDENCIES
will_paginate (= 3.1.6) will_paginate (= 3.1.6)
BUNDLED WITH BUNDLED WITH
1.16.1 1.16.2

1
config/initializers/secure_headers.rb
View file

@ -23,6 +23,7 @@ SecureHeaders::Configuration.default do |config|
if AppConfig.environment.assets.host.present? if AppConfig.environment.assets.host.present?
asset_host = Addressable::URI.parse(AppConfig.environment.assets.host.get).host asset_host = Addressable::URI.parse(AppConfig.environment.assets.host.get).host
csp[:font_src] << asset_host
csp[:script_src] << asset_host csp[:script_src] << asset_host
csp[:style_src] << asset_host csp[:style_src] << asset_host
end end