Merge remote-tracking branch 'upstream/pull/5469'
This commit is contained in:
commit
3faf9a77f7
4 changed files with 6 additions and 2 deletions
|
@ -20,7 +20,7 @@ class ApplicationController < ActionController::Base
|
|||
helper_method :oauth_token
|
||||
|
||||
def self.allow_thirdparty_images(**options)
|
||||
content_security_policy(options) do |policy|
|
||||
content_security_policy(**options) do |policy|
|
||||
policy.img_src("*", :data)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -13,7 +13,7 @@ class DiaryCommentsController < ApplicationController
|
|||
before_action :lookup_user, :only => :index
|
||||
before_action :check_database_writable, :only => [:create, :hide, :unhide]
|
||||
|
||||
allow_thirdparty_images :only => :index
|
||||
allow_thirdparty_images :only => [:index, :create]
|
||||
|
||||
def index
|
||||
@title = t ".title", :user => @user.display_name
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue