aeris 1 год назад
Родитель
Сommit
1809fadc82
13 измененных файлов: 71 добавлений и 21 удалений
  1. +2
    -1
      Gemfile
  2. +3
    -2
      Gemfile.lock
  3. +0
    -5
      bin/rails
  4. +0
    -5
      bin/rake
  5. +3
    -2
      bin/setup
  6. +4
    -2
      bin/update
  7. +11
    -0
      bin/yarn
  8. +1
    -1
      config/boot.rb
  9. +14
    -0
      config/initializers/assets.rb
  10. +25
    -0
      config/initializers/content_security_policy.rb
  11. +5
    -0
      config/initializers/cookies_serializer.rb
  12. +1
    -1
      config/initializers/wrap_parameters.rb
  13. +2
    -2
      config/spring.rb

+ 2
- 1
Gemfile Просмотреть файл

@@ -1,7 +1,8 @@
ruby '2.6.0'
source 'https://rubygems.org'

gem 'rails'
gem 'rails', '~> 5.2.2'
gem 'bundler', '< 2'
gem 'puma'
gem 'dotenv-rails'
gem 'bootsnap', require: false


+ 3
- 2
Gemfile.lock Просмотреть файл

@@ -274,6 +274,7 @@ DEPENDENCIES
better_errors
binding_of_caller
bootsnap
bundler (< 2)
coffee-rails
colorize
diffy
@@ -291,7 +292,7 @@ DEPENDENCIES
pry-rails
puma
rack-livereload
rails
rails (~> 5.2.2)
rspec-rails
ruby-xz
sass-rails
@@ -310,4 +311,4 @@ RUBY VERSION
ruby 2.6.0p0

BUNDLED WITH
2.0.1
1.17.3

+ 0
- 5
bin/rails Просмотреть файл

@@ -1,9 +1,4 @@
#!/usr/bin/env ruby
begin
load File.expand_path('../spring', __FILE__)
rescue LoadError => e
raise unless e.message.include?('spring')
end
APP_PATH = File.expand_path('../config/application', __dir__)
require_relative '../config/boot'
require 'rails/commands'

+ 0
- 5
bin/rake Просмотреть файл

@@ -1,9 +1,4 @@
#!/usr/bin/env ruby
begin
load File.expand_path('../spring', __FILE__)
rescue LoadError => e
raise unless e.message.include?('spring')
end
require_relative '../config/boot'
require 'rake'
Rake.application.run

+ 3
- 2
bin/setup Просмотреть файл

@@ -1,10 +1,9 @@
#!/usr/bin/env ruby
require 'pathname'
require 'fileutils'
include FileUtils

# path to your application root.
APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
APP_ROOT = File.expand_path('..', __dir__)

def system!(*args)
system(*args) || abort("\n== Command #{args} failed ==")
@@ -18,6 +17,8 @@ chdir APP_ROOT do
system! 'gem install bundler --conservative'
system('bundle check') || system!('bundle install')

# Install JavaScript dependencies if using Yarn
# system('bin/yarn')

# puts "\n== Copying sample files =="
# unless File.exist?('config/database.yml')


+ 4
- 2
bin/update Просмотреть файл

@@ -1,10 +1,9 @@
#!/usr/bin/env ruby
require 'pathname'
require 'fileutils'
include FileUtils

# path to your application root.
APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
APP_ROOT = File.expand_path('..', __dir__)

def system!(*args)
system(*args) || abort("\n== Command #{args} failed ==")
@@ -18,6 +17,9 @@ chdir APP_ROOT do
system! 'gem install bundler --conservative'
system('bundle check') || system!('bundle install')

# Install JavaScript dependencies if using Yarn
# system('bin/yarn')

puts "\n== Updating database =="
system! 'bin/rails db:migrate'



+ 11
- 0
bin/yarn Просмотреть файл

@@ -0,0 +1,11 @@
#!/usr/bin/env ruby
APP_ROOT = File.expand_path('..', __dir__)
Dir.chdir(APP_ROOT) do
begin
exec "yarnpkg", *ARGV
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

+ 1
- 1
config/boot.rb Просмотреть файл

@@ -1,4 +1,4 @@
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)

require 'bundler/setup' # Set up gems listed in the Gemfile.
require 'bootsnap/setup'
require 'bootsnap/setup' # Speed up boot time by caching expensive operations.

+ 14
- 0
config/initializers/assets.rb Просмотреть файл

@@ -0,0 +1,14 @@
# Be sure to restart your server when you modify this file.

# Version of your assets, change this if you want to expire all your assets.
Rails.application.config.assets.version = '1.0'

# Add additional assets to the asset load path.
# Rails.application.config.assets.paths << Emoji.images_path
# Add Yarn node_modules folder to the asset load path.
Rails.application.config.assets.paths << Rails.root.join('node_modules')

# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in the app/assets
# folder are already added.
# Rails.application.config.assets.precompile += %w( admin.js admin.css )

+ 25
- 0
config/initializers/content_security_policy.rb Просмотреть файл

@@ -0,0 +1,25 @@
# Be sure to restart your server when you modify this file.

# 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 |policy|
# policy.default_src :self, :https
# policy.font_src :self, :https, :data
# policy.img_src :self, :https, :data
# policy.object_src :none
# policy.script_src :self, :https
# policy.style_src :self, :https

# # Specify URI for violation reports
# # policy.report_uri "/csp-violation-report-endpoint"
# end

# If you are using UJS then enable automatic nonce generation
# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }

# 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

+ 5
- 0
config/initializers/cookies_serializer.rb Просмотреть файл

@@ -0,0 +1,5 @@
# Be sure to restart your server when you modify this file.

# Specify a serializer for the signed and encrypted cookie jars.
# Valid options are :json, :marshal, and :hybrid.
Rails.application.config.action_dispatch.cookies_serializer = :json

+ 1
- 1
config/initializers/wrap_parameters.rb Просмотреть файл

@@ -5,7 +5,7 @@

# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
ActiveSupport.on_load(:action_controller) do
wrap_parameters format: [:json]
wrap_parameters format: [:json]
end

# To enable root element in JSON for ActiveRecord objects.


+ 2
- 2
config/spring.rb Просмотреть файл

@@ -1,6 +1,6 @@
%w(
%w[
.ruby-version
.rbenv-vars
tmp/restart.txt
tmp/caching-dev.txt
).each { |path| Spring.watch(path) }
].each { |path| Spring.watch(path) }

Загрузка…
Отмена
Сохранить