Skip to content

Commit 976e8d2

Browse files
committed
7.0 not very tested
1 parent d58cc4c commit 976e8d2

18 files changed

+265
-92
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ gem 'nokogiri'
4242
# gem 'paperclip', '~> 5.2'
4343
gem 'kt-paperclip', '~> 7.0.0'
4444
gem 'paranoia'
45-
gem 'pg', '~> 0.15'
45+
gem 'pg', '~> 1.4.1'
4646
gem 'puma'
4747
gem 'rake', '< 13.0'
4848
gem 'rack-attack'
4949
gem 'rack-mini-profiler'
50-
gem 'rails', '6.0.5.1'
50+
gem 'rails', '6.1.6.1'
5151
gem 'record_tag_helper', '~> 1.0'
5252
gem 'react-rails', '~> 2.3.0'
5353
gem 'recap', '~> 1.0.0'

Gemfile.lock

Lines changed: 67 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -2,61 +2,65 @@ GEM
22
remote: https://rubygems.org/
33
remote: https://rails-assets.org/
44
specs:
5-
actioncable (6.0.5.1)
6-
actionpack (= 6.0.5.1)
5+
actioncable (6.1.6.1)
6+
actionpack (= 6.1.6.1)
7+
activesupport (= 6.1.6.1)
78
nio4r (~> 2.0)
89
websocket-driver (>= 0.6.1)
9-
actionmailbox (6.0.5.1)
10-
actionpack (= 6.0.5.1)
11-
activejob (= 6.0.5.1)
12-
activerecord (= 6.0.5.1)
13-
activestorage (= 6.0.5.1)
14-
activesupport (= 6.0.5.1)
10+
actionmailbox (6.1.6.1)
11+
actionpack (= 6.1.6.1)
12+
activejob (= 6.1.6.1)
13+
activerecord (= 6.1.6.1)
14+
activestorage (= 6.1.6.1)
15+
activesupport (= 6.1.6.1)
1516
mail (>= 2.7.1)
16-
actionmailer (6.0.5.1)
17-
actionpack (= 6.0.5.1)
18-
actionview (= 6.0.5.1)
19-
activejob (= 6.0.5.1)
17+
actionmailer (6.1.6.1)
18+
actionpack (= 6.1.6.1)
19+
actionview (= 6.1.6.1)
20+
activejob (= 6.1.6.1)
21+
activesupport (= 6.1.6.1)
2022
mail (~> 2.5, >= 2.5.4)
2123
rails-dom-testing (~> 2.0)
22-
actionpack (6.0.5.1)
23-
actionview (= 6.0.5.1)
24-
activesupport (= 6.0.5.1)
25-
rack (~> 2.0, >= 2.0.8)
24+
actionpack (6.1.6.1)
25+
actionview (= 6.1.6.1)
26+
activesupport (= 6.1.6.1)
27+
rack (~> 2.0, >= 2.0.9)
2628
rack-test (>= 0.6.3)
2729
rails-dom-testing (~> 2.0)
2830
rails-html-sanitizer (~> 1.0, >= 1.2.0)
29-
actiontext (6.0.5.1)
30-
actionpack (= 6.0.5.1)
31-
activerecord (= 6.0.5.1)
32-
activestorage (= 6.0.5.1)
33-
activesupport (= 6.0.5.1)
31+
actiontext (6.1.6.1)
32+
actionpack (= 6.1.6.1)
33+
activerecord (= 6.1.6.1)
34+
activestorage (= 6.1.6.1)
35+
activesupport (= 6.1.6.1)
3436
nokogiri (>= 1.8.5)
35-
actionview (6.0.5.1)
36-
activesupport (= 6.0.5.1)
37+
actionview (6.1.6.1)
38+
activesupport (= 6.1.6.1)
3739
builder (~> 3.1)
3840
erubi (~> 1.4)
3941
rails-dom-testing (~> 2.0)
4042
rails-html-sanitizer (~> 1.1, >= 1.2.0)
41-
activejob (6.0.5.1)
42-
activesupport (= 6.0.5.1)
43+
activejob (6.1.6.1)
44+
activesupport (= 6.1.6.1)
4345
globalid (>= 0.3.6)
44-
activemodel (6.0.5.1)
45-
activesupport (= 6.0.5.1)
46-
activerecord (6.0.5.1)
47-
activemodel (= 6.0.5.1)
48-
activesupport (= 6.0.5.1)
49-
activestorage (6.0.5.1)
50-
actionpack (= 6.0.5.1)
51-
activejob (= 6.0.5.1)
52-
activerecord (= 6.0.5.1)
46+
activemodel (6.1.6.1)
47+
activesupport (= 6.1.6.1)
48+
activerecord (6.1.6.1)
49+
activemodel (= 6.1.6.1)
50+
activesupport (= 6.1.6.1)
51+
activestorage (6.1.6.1)
52+
actionpack (= 6.1.6.1)
53+
activejob (= 6.1.6.1)
54+
activerecord (= 6.1.6.1)
55+
activesupport (= 6.1.6.1)
5356
marcel (~> 1.0)
54-
activesupport (6.0.5.1)
57+
mini_mime (>= 1.1.0)
58+
activesupport (6.1.6.1)
5559
concurrent-ruby (~> 1.0, >= 1.0.2)
56-
i18n (>= 0.7, < 2)
57-
minitest (~> 5.1)
58-
tzinfo (~> 1.1)
59-
zeitwerk (~> 2.2, >= 2.2.2)
60+
i18n (>= 1.6, < 2)
61+
minitest (>= 5.1)
62+
tzinfo (~> 2.0)
63+
zeitwerk (~> 2.3)
6064
acts-as-taggable-on (7.0.0)
6165
activerecord (>= 5.0, < 6.2)
6266
addressable (2.8.0)
@@ -304,7 +308,7 @@ GEM
304308
orm_adapter (0.5.0)
305309
paranoia (2.6.0)
306310
activerecord (>= 5.1, < 7.1)
307-
pg (0.21.0)
311+
pg (1.4.1)
308312
poltergeist (1.18.1)
309313
capybara (>= 2.1, < 4)
310314
cliver (~> 0.3.1)
@@ -325,20 +329,20 @@ GEM
325329
rack
326330
rack-test (2.0.2)
327331
rack (>= 1.3)
328-
rails (6.0.5.1)
329-
actioncable (= 6.0.5.1)
330-
actionmailbox (= 6.0.5.1)
331-
actionmailer (= 6.0.5.1)
332-
actionpack (= 6.0.5.1)
333-
actiontext (= 6.0.5.1)
334-
actionview (= 6.0.5.1)
335-
activejob (= 6.0.5.1)
336-
activemodel (= 6.0.5.1)
337-
activerecord (= 6.0.5.1)
338-
activestorage (= 6.0.5.1)
339-
activesupport (= 6.0.5.1)
340-
bundler (>= 1.3.0)
341-
railties (= 6.0.5.1)
332+
rails (6.1.6.1)
333+
actioncable (= 6.1.6.1)
334+
actionmailbox (= 6.1.6.1)
335+
actionmailer (= 6.1.6.1)
336+
actionpack (= 6.1.6.1)
337+
actiontext (= 6.1.6.1)
338+
actionview (= 6.1.6.1)
339+
activejob (= 6.1.6.1)
340+
activemodel (= 6.1.6.1)
341+
activerecord (= 6.1.6.1)
342+
activestorage (= 6.1.6.1)
343+
activesupport (= 6.1.6.1)
344+
bundler (>= 1.15.0)
345+
railties (= 6.1.6.1)
342346
sprockets-rails (>= 2.0.0)
343347
rails-assets-axios (0.27.2)
344348
rails-assets-bootstrap-tagsinput (0.8.0)
@@ -365,12 +369,12 @@ GEM
365369
rails_stdout_logging
366370
rails_serve_static_assets (0.0.5)
367371
rails_stdout_logging (0.0.5)
368-
railties (6.0.5.1)
369-
actionpack (= 6.0.5.1)
370-
activesupport (= 6.0.5.1)
372+
railties (6.1.6.1)
373+
actionpack (= 6.1.6.1)
374+
activesupport (= 6.1.6.1)
371375
method_source
372-
rake (>= 0.8.7)
373-
thor (>= 0.20.3, < 2.0)
376+
rake (>= 12.2)
377+
thor (~> 1.0)
374378
rake (12.3.3)
375379
rb-fsevent (0.11.1)
376380
rb-inotify (0.10.1)
@@ -478,8 +482,8 @@ GEM
478482
execjs (>= 2.2.2, >= 2.2)
479483
less-rails (>= 2.5.0)
480484
railties (>= 3.1)
481-
tzinfo (1.2.10)
482-
thread_safe (~> 0.1)
485+
tzinfo (2.0.5)
486+
concurrent-ruby (~> 1.0)
483487
uglifier (4.2.0)
484488
execjs (>= 0.3.0, < 3)
485489
virtus (2.0.0)
@@ -547,13 +551,13 @@ DEPENDENCIES
547551
neat (~> 1.7.1)
548552
nokogiri
549553
paranoia
550-
pg (~> 0.15)
554+
pg (~> 1.4.1)
551555
poltergeist
552556
pry
553557
puma
554558
rack-attack
555559
rack-mini-profiler
556-
rails (= 6.0.5.1)
560+
rails (= 6.1.6.1)
557561
rails-assets-axios!
558562
rails-assets-bootstrap-tagsinput!
559563
rails-assets-jquery-timeago!

bin/rails

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env ruby
22
APP_PATH = File.expand_path('../config/application', __dir__)
3-
require_relative '../config/boot'
4-
require 'rails/commands'
3+
require_relative "../config/boot"
4+
require "rails/commands"

bin/rake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env ruby
2-
require_relative '../config/boot'
3-
require 'rake'
2+
require_relative "../config/boot"
3+
require "rake"
44
Rake.application.run

bin/setup

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env ruby
2-
require 'fileutils'
2+
require "fileutils"
33

44
# path to your application root.
55
APP_ROOT = File.expand_path('..', __dir__)
@@ -9,16 +9,16 @@ def system!(*args)
99
end
1010

1111
FileUtils.chdir APP_ROOT do
12-
# This script is a way to setup or update your development environment automatically.
13-
# This script is idempotent, so that you can run it at anytime and get an expectable outcome.
12+
# This script is a way to set up or update your development environment automatically.
13+
# This script is idempotent, so that you can run it at any time and get an expectable outcome.
1414
# Add necessary setup steps to this file.
1515

1616
puts '== Installing dependencies =='
1717
system! 'gem install bundler --conservative'
1818
system('bundle check') || system!('bundle install')
1919

2020
# Install JavaScript dependencies
21-
# system('bin/yarn')
21+
system! 'bin/yarn'
2222

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

bin/yarn

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
#!/usr/bin/env ruby
22
APP_ROOT = File.expand_path('..', __dir__)
33
Dir.chdir(APP_ROOT) do
4-
begin
5-
exec "yarnpkg", *ARGV
6-
rescue Errno::ENOENT
4+
yarn = ENV["PATH"].split(File::PATH_SEPARATOR).
5+
select { |dir| File.expand_path(dir) != __dir__ }.
6+
product(["yarn", "yarn.cmd", "yarn.ps1"]).
7+
map { |dir, file| File.expand_path(file, dir) }.
8+
find { |file| File.executable?(file) }
9+
10+
if yarn
11+
exec yarn, *ARGV
12+
else
713
$stderr.puts "Yarn executable was not detected in the system."
814
$stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
915
exit 1

config.ru

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# This file is used by Rack-based servers to start the application.
22

3-
require ::File.expand_path('../config/environment', __FILE__)
3+
require_relative "config/environment"
4+
45
run Rails.application
6+
Rails.application.load_server

config/boot.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
22

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

config/environments/development.rb

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
require "active_support/core_ext/integer/time"
2+
13
Rails.application.configure do
24
# Settings specified here will take precedence over those in config/application.rb.
35

4-
# In the development environment your application's code is reloaded on
5-
# every request. This slows down response time but is perfect for development
6+
# In the development environment your application's code is reloaded any time
7+
# it changes. This slows down response time but is perfect for development
68
# since you don't have to restart the web server when you make code changes.
79
config.cache_classes = false
810

@@ -39,6 +41,12 @@
3941
# Print deprecation notices to the Rails logger.
4042
config.active_support.deprecation = :log
4143

44+
# Raise exceptions for disallowed deprecations.
45+
config.active_support.disallowed_deprecation = :raise
46+
47+
# Tell Active Support which deprecation messages to disallow.
48+
config.active_support.disallowed_deprecation_warnings = []
49+
4250
# Raise an error on page load if there are pending migrations.
4351
config.active_record.migration_error = :page_load
4452

@@ -54,9 +62,15 @@
5462
config.assets.quiet = true
5563

5664
# Raises error for missing translations.
57-
# config.action_view.raise_on_missing_translations = true
65+
# config.i18n.raise_on_missing_translations = true
66+
67+
# Annotate rendered view with file names.
68+
# config.action_view.annotate_rendered_view_with_filenames = true
5869

5970
# Use an evented file watcher to asynchronously detect changes in source code,
6071
# routes, locales, etc. This feature depends on the listen gem.
6172
config.file_watcher = ActiveSupport::EventedFileUpdateChecker
73+
74+
# Uncomment if you wish to allow Action Cable access from any origin.
75+
# config.action_cable.disable_request_forgery_protection = true
6276
end

config/environments/test.rb

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
require "active_support/core_ext/integer/time"
2+
13
# The test environment is used exclusively to run your application's
24
# test suite. You never need to work with it otherwise. Remember that
35
# your test database is "scratch space" for the test suite and is wiped
@@ -43,6 +45,15 @@
4345
# Print deprecation notices to the stderr.
4446
config.active_support.deprecation = :stderr
4547

48+
# Raise exceptions for disallowed deprecations.
49+
config.active_support.disallowed_deprecation = :raise
50+
51+
# Tell Active Support which deprecation messages to disallow.
52+
config.active_support.disallowed_deprecation_warnings = []
53+
4654
# Raises error for missing translations.
47-
# config.action_view.raise_on_missing_translations = true
55+
# config.i18n.raise_on_missing_translations = true
56+
57+
# Annotate rendered view with file names.
58+
# config.action_view.annotate_rendered_view_with_filenames = true
4859
end

0 commit comments

Comments
 (0)