Skip to content

Commit a45b899

Browse files
dylanfisherdylanfisher
committed
Merge branch 'v2'
2 parents ac322c4 + 24c1eb4 commit a45b899

File tree

1,512 files changed

+12903
-11866
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,512 files changed

+12903
-11866
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@ test/dummy/log/*.log
3737
test/dummy/tmp/
3838

3939
node_modules
40+
/yarn-error.log
41+
yarn-debug.log*
42+
.yarn-integrity

‎Gemfile.lock

+125-139
Original file line numberDiff line numberDiff line change
@@ -1,250 +1,236 @@
11
PATH
22
remote: .
33
specs:
4-
forest (0.111.2)
4+
forest (2.0.0)
55
aws-sdk-s3
6-
bootstrap-sass
6+
bootstrap
77
cocoon
8+
deep_cloneable
89
devise
910
has_scope
1011
jbuilder
11-
jquery-fileupload-rails
1212
jquery-rails
1313
jquery-ui-rails
14-
kaminari
1514
nokogiri
16-
paperclip
15+
pagy
1716
pundit
1817
rails
1918
redcarpet
20-
sass-rails
19+
shrine (~> 3.0)
2120
simple_form
22-
turbolinks
21+
uppy-s3_multipart (~> 0.3)
2322

2423
GEM
2524
remote: https://rubygems.org/
2625
specs:
27-
actioncable (6.0.0)
28-
actionpack (= 6.0.0)
26+
actioncable (6.0.3.2)
27+
actionpack (= 6.0.3.2)
2928
nio4r (~> 2.0)
3029
websocket-driver (>= 0.6.1)
31-
actionmailbox (6.0.0)
32-
actionpack (= 6.0.0)
33-
activejob (= 6.0.0)
34-
activerecord (= 6.0.0)
35-
activestorage (= 6.0.0)
36-
activesupport (= 6.0.0)
30+
actionmailbox (6.0.3.2)
31+
actionpack (= 6.0.3.2)
32+
activejob (= 6.0.3.2)
33+
activerecord (= 6.0.3.2)
34+
activestorage (= 6.0.3.2)
35+
activesupport (= 6.0.3.2)
3736
mail (>= 2.7.1)
38-
actionmailer (6.0.0)
39-
actionpack (= 6.0.0)
40-
actionview (= 6.0.0)
41-
activejob (= 6.0.0)
37+
actionmailer (6.0.3.2)
38+
actionpack (= 6.0.3.2)
39+
actionview (= 6.0.3.2)
40+
activejob (= 6.0.3.2)
4241
mail (~> 2.5, >= 2.5.4)
4342
rails-dom-testing (~> 2.0)
44-
actionpack (6.0.0)
45-
actionview (= 6.0.0)
46-
activesupport (= 6.0.0)
47-
rack (~> 2.0)
43+
actionpack (6.0.3.2)
44+
actionview (= 6.0.3.2)
45+
activesupport (= 6.0.3.2)
46+
rack (~> 2.0, >= 2.0.8)
4847
rack-test (>= 0.6.3)
4948
rails-dom-testing (~> 2.0)
5049
rails-html-sanitizer (~> 1.0, >= 1.2.0)
51-
actiontext (6.0.0)
52-
actionpack (= 6.0.0)
53-
activerecord (= 6.0.0)
54-
activestorage (= 6.0.0)
55-
activesupport (= 6.0.0)
50+
actiontext (6.0.3.2)
51+
actionpack (= 6.0.3.2)
52+
activerecord (= 6.0.3.2)
53+
activestorage (= 6.0.3.2)
54+
activesupport (= 6.0.3.2)
5655
nokogiri (>= 1.8.5)
57-
actionview (6.0.0)
58-
activesupport (= 6.0.0)
56+
actionview (6.0.3.2)
57+
activesupport (= 6.0.3.2)
5958
builder (~> 3.1)
6059
erubi (~> 1.4)
6160
rails-dom-testing (~> 2.0)
6261
rails-html-sanitizer (~> 1.1, >= 1.2.0)
63-
activejob (6.0.0)
64-
activesupport (= 6.0.0)
62+
activejob (6.0.3.2)
63+
activesupport (= 6.0.3.2)
6564
globalid (>= 0.3.6)
66-
activemodel (6.0.0)
67-
activesupport (= 6.0.0)
68-
activerecord (6.0.0)
69-
activemodel (= 6.0.0)
70-
activesupport (= 6.0.0)
71-
activestorage (6.0.0)
72-
actionpack (= 6.0.0)
73-
activejob (= 6.0.0)
74-
activerecord (= 6.0.0)
65+
activemodel (6.0.3.2)
66+
activesupport (= 6.0.3.2)
67+
activerecord (6.0.3.2)
68+
activemodel (= 6.0.3.2)
69+
activesupport (= 6.0.3.2)
70+
activestorage (6.0.3.2)
71+
actionpack (= 6.0.3.2)
72+
activejob (= 6.0.3.2)
73+
activerecord (= 6.0.3.2)
7574
marcel (~> 0.3.1)
76-
activesupport (6.0.0)
75+
activesupport (6.0.3.2)
7776
concurrent-ruby (~> 1.0, >= 1.0.2)
7877
i18n (>= 0.7, < 2)
7978
minitest (~> 5.1)
8079
tzinfo (~> 1.1)
81-
zeitwerk (~> 2.1, >= 2.1.8)
82-
autoprefixer-rails (9.6.1.1)
80+
zeitwerk (~> 2.2, >= 2.2.2)
81+
addressable (2.7.0)
82+
public_suffix (>= 2.0.2, < 5.0)
83+
autoprefixer-rails (9.8.5)
8384
execjs
84-
aws-eventstream (1.0.3)
85-
aws-partitions (1.211.0)
86-
aws-sdk-core (3.67.0)
87-
aws-eventstream (~> 1.0, >= 1.0.2)
88-
aws-partitions (~> 1.0)
85+
aws-eventstream (1.1.0)
86+
aws-partitions (1.341.0)
87+
aws-sdk-core (3.103.0)
88+
aws-eventstream (~> 1, >= 1.0.2)
89+
aws-partitions (~> 1, >= 1.239.0)
8990
aws-sigv4 (~> 1.1)
9091
jmespath (~> 1.0)
91-
aws-sdk-kms (1.24.0)
92-
aws-sdk-core (~> 3, >= 3.61.1)
92+
aws-sdk-kms (1.36.0)
93+
aws-sdk-core (~> 3, >= 3.99.0)
9394
aws-sigv4 (~> 1.1)
94-
aws-sdk-s3 (1.48.0)
95-
aws-sdk-core (~> 3, >= 3.61.1)
95+
aws-sdk-s3 (1.74.0)
96+
aws-sdk-core (~> 3, >= 3.102.1)
9697
aws-sdk-kms (~> 1)
9798
aws-sigv4 (~> 1.1)
98-
aws-sigv4 (1.1.0)
99-
aws-eventstream (~> 1.0, >= 1.0.2)
99+
aws-sigv4 (1.2.1)
100+
aws-eventstream (~> 1, >= 1.0.2)
100101
bcrypt (3.1.13)
101-
bootstrap-sass (3.4.1)
102-
autoprefixer-rails (>= 5.2.1)
103-
sassc (>= 2.0.0)
104-
builder (3.2.3)
105-
climate_control (0.2.0)
102+
bootstrap (4.5.0)
103+
autoprefixer-rails (>= 9.1.0)
104+
popper_js (>= 1.14.3, < 2)
105+
sassc-rails (>= 2.0.0)
106+
builder (3.2.4)
106107
cocoon (1.2.14)
107-
concurrent-ruby (1.1.5)
108-
crass (1.0.4)
109-
devise (4.7.1)
108+
concurrent-ruby (1.1.6)
109+
content_disposition (1.0.0)
110+
crass (1.0.6)
111+
deep_cloneable (3.0.0)
112+
activerecord (>= 3.1.0, < 7)
113+
devise (4.7.2)
110114
bcrypt (~> 3.0)
111115
orm_adapter (~> 0.1)
112116
railties (>= 4.1.0)
113117
responders
114118
warden (~> 1.2.3)
115-
erubi (1.8.0)
119+
down (5.1.1)
120+
addressable (~> 2.5)
121+
erubi (1.9.0)
116122
execjs (2.7.0)
117-
ffi (1.11.1)
123+
ffi (1.13.1)
118124
globalid (0.4.2)
119125
activesupport (>= 4.2.0)
120126
has_scope (0.7.2)
121127
actionpack (>= 4.1)
122128
activesupport (>= 4.1)
123-
i18n (1.6.0)
129+
i18n (1.8.3)
124130
concurrent-ruby (~> 1.0)
125-
jbuilder (2.9.1)
126-
activesupport (>= 4.2.0)
131+
jbuilder (2.10.0)
132+
activesupport (>= 5.0.0)
127133
jmespath (1.4.0)
128-
jquery-fileupload-rails (1.0.0)
129-
actionpack (>= 3.1)
130-
railties (>= 3.1)
131-
sassc
132-
jquery-rails (4.3.5)
134+
jquery-rails (4.4.0)
133135
rails-dom-testing (>= 1, < 3)
134136
railties (>= 4.2.0)
135137
thor (>= 0.14, < 2.0)
136138
jquery-ui-rails (6.0.1)
137139
railties (>= 3.2.16)
138-
kaminari (1.1.1)
139-
activesupport (>= 4.1.0)
140-
kaminari-actionview (= 1.1.1)
141-
kaminari-activerecord (= 1.1.1)
142-
kaminari-core (= 1.1.1)
143-
kaminari-actionview (1.1.1)
144-
actionview
145-
kaminari-core (= 1.1.1)
146-
kaminari-activerecord (1.1.1)
147-
activerecord
148-
kaminari-core (= 1.1.1)
149-
kaminari-core (1.1.1)
150-
loofah (2.2.3)
140+
loofah (2.6.0)
151141
crass (~> 1.0.2)
152142
nokogiri (>= 1.5.9)
153143
mail (2.7.1)
154144
mini_mime (>= 0.1.1)
155145
marcel (0.3.3)
156146
mimemagic (~> 0.3.2)
157-
method_source (0.9.2)
158-
mime-types (3.3)
159-
mime-types-data (~> 3.2015)
160-
mime-types-data (3.2019.0904)
161-
mimemagic (0.3.3)
147+
method_source (1.0.0)
148+
mimemagic (0.3.5)
162149
mini_mime (1.0.2)
163150
mini_portile2 (2.4.0)
164-
minitest (5.11.3)
165-
nio4r (2.5.1)
166-
nokogiri (1.10.4)
151+
minitest (5.14.1)
152+
nio4r (2.5.2)
153+
nokogiri (1.10.10)
167154
mini_portile2 (~> 2.4.0)
168155
orm_adapter (0.5.0)
169-
paperclip (6.1.0)
170-
activemodel (>= 4.2.0)
171-
activesupport (>= 4.2.0)
172-
mime-types
173-
mimemagic (~> 0.3.0)
174-
terrapin (~> 0.6.0)
175-
pg (1.1.4)
156+
pagy (3.8.2)
157+
pg (1.2.3)
158+
popper_js (1.16.0)
159+
public_suffix (4.0.5)
176160
pundit (2.1.0)
177161
activesupport (>= 3.0.0)
178-
rack (2.0.7)
162+
rack (2.2.3)
179163
rack-test (1.1.0)
180164
rack (>= 1.0, < 3)
181-
rails (6.0.0)
182-
actioncable (= 6.0.0)
183-
actionmailbox (= 6.0.0)
184-
actionmailer (= 6.0.0)
185-
actionpack (= 6.0.0)
186-
actiontext (= 6.0.0)
187-
actionview (= 6.0.0)
188-
activejob (= 6.0.0)
189-
activemodel (= 6.0.0)
190-
activerecord (= 6.0.0)
191-
activestorage (= 6.0.0)
192-
activesupport (= 6.0.0)
165+
rails (6.0.3.2)
166+
actioncable (= 6.0.3.2)
167+
actionmailbox (= 6.0.3.2)
168+
actionmailer (= 6.0.3.2)
169+
actionpack (= 6.0.3.2)
170+
actiontext (= 6.0.3.2)
171+
actionview (= 6.0.3.2)
172+
activejob (= 6.0.3.2)
173+
activemodel (= 6.0.3.2)
174+
activerecord (= 6.0.3.2)
175+
activestorage (= 6.0.3.2)
176+
activesupport (= 6.0.3.2)
193177
bundler (>= 1.3.0)
194-
railties (= 6.0.0)
178+
railties (= 6.0.3.2)
195179
sprockets-rails (>= 2.0.0)
196180
rails-dom-testing (2.0.3)
197181
activesupport (>= 4.2.0)
198182
nokogiri (>= 1.6)
199-
rails-html-sanitizer (1.2.0)
200-
loofah (~> 2.2, >= 2.2.2)
201-
railties (6.0.0)
202-
actionpack (= 6.0.0)
203-
activesupport (= 6.0.0)
183+
rails-html-sanitizer (1.3.0)
184+
loofah (~> 2.3)
185+
railties (6.0.3.2)
186+
actionpack (= 6.0.3.2)
187+
activesupport (= 6.0.3.2)
204188
method_source
205189
rake (>= 0.8.7)
206190
thor (>= 0.20.3, < 2.0)
207-
rake (12.3.3)
191+
rake (13.0.1)
208192
redcarpet (3.5.0)
209-
responders (3.0.0)
193+
responders (3.0.1)
210194
actionpack (>= 5.0)
211195
railties (>= 5.0)
212-
sass-rails (6.0.0)
213-
sassc-rails (~> 2.1, >= 2.1.1)
214-
sassc (2.2.0)
196+
roda (3.33.0)
197+
rack
198+
sassc (2.4.0)
215199
ffi (~> 1.9)
216200
sassc-rails (2.1.2)
217201
railties (>= 4.0.0)
218202
sassc (>= 2.0)
219203
sprockets (> 3.0)
220204
sprockets-rails
221205
tilt
222-
simple_form (4.1.0)
206+
shrine (3.2.1)
207+
content_disposition (~> 1.0)
208+
down (~> 5.1)
209+
simple_form (5.0.2)
223210
actionpack (>= 5.0)
224211
activemodel (>= 5.0)
225-
sprockets (3.7.2)
212+
sprockets (4.0.2)
226213
concurrent-ruby (~> 1.0)
227214
rack (> 1, < 3)
228215
sprockets-rails (3.2.1)
229216
actionpack (>= 4.0)
230217
activesupport (>= 4.0)
231218
sprockets (>= 3.0.0)
232-
terrapin (0.6.0)
233-
climate_control (>= 0.0.3, < 1.0)
234-
thor (0.20.3)
219+
thor (1.0.1)
235220
thread_safe (0.3.6)
236-
tilt (2.0.9)
237-
turbolinks (5.2.0)
238-
turbolinks-source (~> 5.2)
239-
turbolinks-source (5.2.0)
240-
tzinfo (1.2.5)
221+
tilt (2.0.10)
222+
tzinfo (1.2.7)
241223
thread_safe (~> 0.1)
224+
uppy-s3_multipart (0.3.4)
225+
aws-sdk-s3 (~> 1.0)
226+
content_disposition (~> 1.0)
227+
roda (>= 2.27, < 4)
242228
warden (1.2.8)
243229
rack (>= 2.0.6)
244-
websocket-driver (0.7.1)
230+
websocket-driver (0.7.3)
245231
websocket-extensions (>= 0.1.0)
246-
websocket-extensions (0.1.4)
247-
zeitwerk (2.1.10)
232+
websocket-extensions (0.1.5)
233+
zeitwerk (2.3.1)
248234

249235
PLATFORMS
250236
ruby
@@ -254,4 +240,4 @@ DEPENDENCIES
254240
pg
255241

256242
BUNDLED WITH
257-
1.16.2
243+
2.1.4

0 commit comments

Comments
 (0)