mirror of https://github.com/mastodon/mastodon
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: Gemfile.lock config/application.rbpull/12504/head
David Yip
7 years ago
commit
ed490b781f
@ -1,3 +1,3 @@
|
|||||||
#!/usr/bin/env ruby
|
#!/usr/bin/env ruby
|
||||||
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
|
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
|
||||||
load Gem.bin_path('bundler', 'bundle')
|
load Gem.bin_path('bundler', 'bundle')
|
||||||
|
|||||||
@ -0,0 +1,11 @@
|
|||||||
|
#!/usr/bin/env ruby
|
||||||
|
APP_ROOT = File.expand_path('..', __dir__)
|
||||||
|
Dir.chdir(APP_ROOT) do
|
||||||
|
begin
|
||||||
|
exec "yarnpkg #{ARGV.join(' ')}" unless Dir.exist?('node_modules')
|
||||||
|
rescue Errno::ENOENT
|
||||||
|
$stderr.puts "Yarn executable was not detected in the system."
|
||||||
|
$stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
|
||||||
|
exit 1
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
# Define an application-wide content security policy
|
||||||
|
# For further information see the following documentation
|
||||||
|
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
|
||||||
|
|
||||||
|
# Rails.application.config.content_security_policy do |p|
|
||||||
|
# p.default_src :self, :https
|
||||||
|
# p.font_src :self, :https, :data
|
||||||
|
# p.img_src :self, :https, :data
|
||||||
|
# p.object_src :none
|
||||||
|
# p.script_src :self, :https
|
||||||
|
# p.style_src :self, :https, :unsafe_inline
|
||||||
|
#
|
||||||
|
# # Specify URI for violation reports
|
||||||
|
# # p.report_uri "/csp-violation-report-endpoint"
|
||||||
|
# end
|
||||||
|
|
||||||
|
# Report CSP violations to a specified URI
|
||||||
|
# For further information see the following documentation:
|
||||||
|
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
|
||||||
|
# Rails.application.config.content_security_policy_report_only = true
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
# Be sure to restart your server when you modify this file.
|
||||||
|
|
||||||
|
# Avoid CORS issues when API is called from the frontend app.
|
||||||
|
# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests.
|
||||||
|
|
||||||
|
# Read more: https://github.com/cyu/rack-cors
|
||||||
|
|
||||||
|
Rails.application.config.middleware.insert_before 0, Rack::Cors do
|
||||||
|
allow do
|
||||||
|
origins '*'
|
||||||
|
|
||||||
|
resource '/@:username',
|
||||||
|
headers: :any,
|
||||||
|
methods: [:get],
|
||||||
|
credentials: false
|
||||||
|
resource '/api/*',
|
||||||
|
headers: :any,
|
||||||
|
methods: [:post, :put, :delete, :get, :patch, :options],
|
||||||
|
credentials: false,
|
||||||
|
expose: ['Link', 'X-RateLimit-Reset', 'X-RateLimit-Limit', 'X-RateLimit-Remaining', 'X-Request-Id']
|
||||||
|
resource '/oauth/token',
|
||||||
|
headers: :any,
|
||||||
|
methods: [:post],
|
||||||
|
credentials: false
|
||||||
|
resource '/assets/*', headers: :any, methods: [:get, :head, :options]
|
||||||
|
resource '/stylesheets/*', headers: :any, methods: [:get, :head, :options]
|
||||||
|
resource '/javascripts/*', headers: :any, methods: [:get, :head, :options]
|
||||||
|
resource '/packs/*', headers: :any, methods: [:get, :head, :options]
|
||||||
|
end
|
||||||
|
end
|
||||||
Loading…
Reference in New Issue