Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Google Calendar oneboxes weren't working

This commit is contained in:
Régis Hanol 2018-01-07 19:15:11 +01:00
parent e5affdf230
commit e3f8182125
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -36,7 +36,7 @@ gem 'redis-namespace'
gem 'active_model_serializers', '~> 0.8.3'
gem 'onebox', '1.8.33'
gem 'onebox', '1.8.34'
gem 'http_accept_language', '~>2.0.5', require: false

4
Gemfile.lock
View File

@ -232,7 +232,7 @@ GEM
omniauth-twitter (1.3.0)
omniauth-oauth (~> 1.1)
rack
onebox (1.8.33)
onebox (1.8.34)
fast_blank (>= 1.0.0)
htmlentities (~> 4.3)
moneta (~> 1.0)
@ -469,7 +469,7 @@ DEPENDENCIES
omniauth-oauth2
omniauth-openid
omniauth-twitter
onebox (= 1.8.33)
onebox (= 1.8.34)
openid-redis-store
pg
pry-nav

2
config/site_settings.yml
View File

@ -956,7 +956,7 @@ security:
default: ''
type: list
allowed_iframes:
default: 'https://www.google.com/maps/embed?|https://www.openstreetmap.org/export/embed.html?'
default: 'https://www.google.com/maps/embed?|https://www.openstreetmap.org/export/embed.html?|https://calendar.google.com/calendar/embed?'
type: list
client: true