Skip to content

Commit 52ef4bd

Browse files
committed
Update with main
2 parents 0f1194d + 9f2e10f commit 52ef4bd

16 files changed

Lines changed: 104 additions & 555 deletions

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ gem "puma"
4646
gem "rails", "~> 6.1.4"
4747
gem "sass-rails"
4848
gem "sidekiq"
49-
gem "strong_migrations", "~> 0.7.7"
49+
gem "strong_migrations", "~> 0.7.8"
5050
gem "sprockets", "~> 4.0.2"
5151
gem "toastr-rails"
5252
gem "uglifier", ">= 1.3.0"
@@ -76,7 +76,7 @@ group :development, :test do
7676
gem "pry-remote"
7777
gem "pry-nav"
7878
gem "rb-readline", "~> 0.5.3"
79-
gem "rspec-rails", "~> 5.0.1"
79+
gem "rspec-rails", "~> 5.0.2"
8080
gem "rubocop"
8181
gem "rubocop-rails", "~> 2.9.1"
8282
gem "terminal-notifier-guard"
@@ -96,7 +96,7 @@ group :development do
9696
gem 'capistrano-sidekiq'
9797
gem 'foreman'
9898
gem "letter_opener"
99-
gem "listen", "~> 3.5.0"
99+
gem "listen", "~> 3.7.0"
100100
gem "rails-erd"
101101
gem "spring"
102102
gem "spring-watcher-listen"
@@ -113,7 +113,7 @@ group :test do
113113
gem 'simplecov'
114114
gem 'shoulda-matchers', '~> 5.0'
115115
gem 'webdrivers', '~> 4.6'
116-
gem "webmock", "~> 3.12"
116+
gem "webmock", "~> 3.14"
117117
end
118118

119119
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.1.4)
5-
actionpack (= 6.1.4)
6-
activesupport (= 6.1.4)
4+
actioncable (6.1.4.1)
5+
actionpack (= 6.1.4.1)
6+
activesupport (= 6.1.4.1)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailbox (6.1.4)
10-
actionpack (= 6.1.4)
11-
activejob (= 6.1.4)
12-
activerecord (= 6.1.4)
13-
activestorage (= 6.1.4)
14-
activesupport (= 6.1.4)
9+
actionmailbox (6.1.4.1)
10+
actionpack (= 6.1.4.1)
11+
activejob (= 6.1.4.1)
12+
activerecord (= 6.1.4.1)
13+
activestorage (= 6.1.4.1)
14+
activesupport (= 6.1.4.1)
1515
mail (>= 2.7.1)
16-
actionmailer (6.1.4)
17-
actionpack (= 6.1.4)
18-
actionview (= 6.1.4)
19-
activejob (= 6.1.4)
20-
activesupport (= 6.1.4)
16+
actionmailer (6.1.4.1)
17+
actionpack (= 6.1.4.1)
18+
actionview (= 6.1.4.1)
19+
activejob (= 6.1.4.1)
20+
activesupport (= 6.1.4.1)
2121
mail (~> 2.5, >= 2.5.4)
2222
rails-dom-testing (~> 2.0)
23-
actionpack (6.1.4)
24-
actionview (= 6.1.4)
25-
activesupport (= 6.1.4)
23+
actionpack (6.1.4.1)
24+
actionview (= 6.1.4.1)
25+
activesupport (= 6.1.4.1)
2626
rack (~> 2.0, >= 2.0.9)
2727
rack-test (>= 0.6.3)
2828
rails-dom-testing (~> 2.0)
2929
rails-html-sanitizer (~> 1.0, >= 1.2.0)
30-
actiontext (6.1.4)
31-
actionpack (= 6.1.4)
32-
activerecord (= 6.1.4)
33-
activestorage (= 6.1.4)
34-
activesupport (= 6.1.4)
30+
actiontext (6.1.4.1)
31+
actionpack (= 6.1.4.1)
32+
activerecord (= 6.1.4.1)
33+
activestorage (= 6.1.4.1)
34+
activesupport (= 6.1.4.1)
3535
nokogiri (>= 1.8.5)
36-
actionview (6.1.4)
37-
activesupport (= 6.1.4)
36+
actionview (6.1.4.1)
37+
activesupport (= 6.1.4.1)
3838
builder (~> 3.1)
3939
erubi (~> 1.4)
4040
rails-dom-testing (~> 2.0)
4141
rails-html-sanitizer (~> 1.1, >= 1.2.0)
42-
activejob (6.1.4)
43-
activesupport (= 6.1.4)
42+
activejob (6.1.4.1)
43+
activesupport (= 6.1.4.1)
4444
globalid (>= 0.3.6)
45-
activemodel (6.1.4)
46-
activesupport (= 6.1.4)
47-
activerecord (6.1.4)
48-
activemodel (= 6.1.4)
49-
activesupport (= 6.1.4)
50-
activestorage (6.1.4)
51-
actionpack (= 6.1.4)
52-
activejob (= 6.1.4)
53-
activerecord (= 6.1.4)
54-
activesupport (= 6.1.4)
45+
activemodel (6.1.4.1)
46+
activesupport (= 6.1.4.1)
47+
activerecord (6.1.4.1)
48+
activemodel (= 6.1.4.1)
49+
activesupport (= 6.1.4.1)
50+
activestorage (6.1.4.1)
51+
actionpack (= 6.1.4.1)
52+
activejob (= 6.1.4.1)
53+
activerecord (= 6.1.4.1)
54+
activesupport (= 6.1.4.1)
5555
marcel (~> 1.0.0)
5656
mini_mime (>= 1.1.0)
57-
activesupport (6.1.4)
57+
activesupport (6.1.4.1)
5858
concurrent-ruby (~> 1.0, >= 1.0.2)
5959
i18n (>= 1.6, < 2)
6060
minitest (>= 5.1)
@@ -103,10 +103,10 @@ GEM
103103
railties (>= 4.0)
104104
bootstrap-select-rails (1.13.8)
105105
brakeman (5.1.1)
106-
bugsnag (6.21.0)
106+
bugsnag (6.22.1)
107107
concurrent-ruby (~> 1.0)
108108
builder (3.2.4)
109-
bullet (6.1.4)
109+
bullet (6.1.5)
110110
activesupport (>= 3.0.0)
111111
uniform_notifier (~> 1.11)
112112
capistrano (3.14.1)
@@ -188,7 +188,7 @@ GEM
188188
multipart-post (>= 1.2, < 3)
189189
faraday_middleware (0.14.0)
190190
faraday (>= 0.7.4, < 1.0)
191-
ffi (1.15.0)
191+
ffi (1.15.3)
192192
filterrific (5.2.2)
193193
flipper (0.20.4)
194194
flipper-active_record (0.20.4)
@@ -210,8 +210,8 @@ GEM
210210
jquery-ui-rails (>= 5.0.2)
211211
momentjs-rails (>= 2.9.0)
212212
geocoder (1.6.6)
213-
globalid (0.4.2)
214-
activesupport (>= 4.2.0)
213+
globalid (0.5.2)
214+
activesupport (>= 5.0)
215215
groupdate (5.2.2)
216216
activesupport (>= 5)
217217
guard (2.15.1)
@@ -256,22 +256,22 @@ GEM
256256
activerecord
257257
kaminari-core (= 1.2.1)
258258
kaminari-core (1.2.1)
259-
knapsack_pro (2.18.1)
259+
knapsack_pro (3.1.0)
260260
rake
261261
launchy (2.5.0)
262262
addressable (~> 2.7)
263263
letter_opener (1.7.0)
264264
launchy (~> 2.2)
265265
libv8 (8.4.255.0)
266-
listen (3.5.0)
266+
listen (3.7.0)
267267
rb-fsevent (~> 0.10, >= 0.10.3)
268268
rb-inotify (~> 0.9, >= 0.9.10)
269269
lograge (0.11.2)
270270
actionpack (>= 4)
271271
activesupport (>= 4)
272272
railties (>= 4)
273273
request_store (~> 1.0)
274-
loofah (2.10.0)
274+
loofah (2.12.0)
275275
crass (~> 1.0.2)
276276
nokogiri (>= 1.5.9)
277277
lumberjack (1.0.13)
@@ -292,7 +292,7 @@ GEM
292292
rake
293293
mini_magick (4.11.0)
294294
mini_mime (1.1.0)
295-
mini_portile2 (2.5.3)
295+
mini_portile2 (2.6.1)
296296
mini_racer (0.3.1)
297297
libv8 (~> 8.4.255)
298298
minitest (5.14.4)
@@ -303,9 +303,9 @@ GEM
303303
net-scp (3.0.0)
304304
net-ssh (>= 2.6.5, < 7.0.0)
305305
net-ssh (6.1.0)
306-
nio4r (2.5.7)
307-
nokogiri (1.11.7)
308-
mini_portile2 (~> 2.5.0)
306+
nio4r (2.5.8)
307+
nokogiri (1.12.3)
308+
mini_portile2 (~> 2.6.1)
309309
racc (~> 1.4)
310310
notiffany (0.1.3)
311311
nenv (~> 0.1)
@@ -359,20 +359,20 @@ GEM
359359
rack
360360
rack-test (1.1.0)
361361
rack (>= 1.0, < 3)
362-
rails (6.1.4)
363-
actioncable (= 6.1.4)
364-
actionmailbox (= 6.1.4)
365-
actionmailer (= 6.1.4)
366-
actionpack (= 6.1.4)
367-
actiontext (= 6.1.4)
368-
actionview (= 6.1.4)
369-
activejob (= 6.1.4)
370-
activemodel (= 6.1.4)
371-
activerecord (= 6.1.4)
372-
activestorage (= 6.1.4)
373-
activesupport (= 6.1.4)
362+
rails (6.1.4.1)
363+
actioncable (= 6.1.4.1)
364+
actionmailbox (= 6.1.4.1)
365+
actionmailer (= 6.1.4.1)
366+
actionpack (= 6.1.4.1)
367+
actiontext (= 6.1.4.1)
368+
actionview (= 6.1.4.1)
369+
activejob (= 6.1.4.1)
370+
activemodel (= 6.1.4.1)
371+
activerecord (= 6.1.4.1)
372+
activestorage (= 6.1.4.1)
373+
activesupport (= 6.1.4.1)
374374
bundler (>= 1.15.0)
375-
railties (= 6.1.4)
375+
railties (= 6.1.4.1)
376376
sprockets-rails (>= 2.0.0)
377377
rails-controller-testing (1.0.5)
378378
actionpack (>= 5.0.1.rc1)
@@ -386,17 +386,17 @@ GEM
386386
activesupport (>= 4.2)
387387
choice (~> 0.2.0)
388388
ruby-graphviz (~> 1.2)
389-
rails-html-sanitizer (1.3.0)
389+
rails-html-sanitizer (1.4.1)
390390
loofah (~> 2.3)
391-
railties (6.1.4)
392-
actionpack (= 6.1.4)
393-
activesupport (= 6.1.4)
391+
railties (6.1.4.1)
392+
actionpack (= 6.1.4.1)
393+
activesupport (= 6.1.4.1)
394394
method_source
395395
rake (>= 0.13)
396396
thor (~> 1.0)
397397
rainbow (3.0.0)
398398
rake (13.0.6)
399-
rb-fsevent (0.10.4)
399+
rb-fsevent (0.11.0)
400400
rb-inotify (0.10.1)
401401
ffi (~> 1.0)
402402
rb-readline (0.5.5)
@@ -422,7 +422,7 @@ GEM
422422
rspec-mocks (3.10.2)
423423
diff-lcs (>= 1.2.0, < 2.0)
424424
rspec-support (~> 3.10.0)
425-
rspec-rails (5.0.1)
425+
rspec-rails (5.0.2)
426426
actionpack (>= 5.2)
427427
activesupport (>= 5.2)
428428
railties (>= 5.2)
@@ -454,7 +454,7 @@ GEM
454454
ruby-progressbar (1.10.1)
455455
ruby-vips (2.0.17)
456456
ffi (~> 1.9)
457-
rubyzip (2.3.0)
457+
rubyzip (2.3.2)
458458
sass-rails (6.0.0)
459459
sassc-rails (~> 2.1, >= 2.1.1)
460460
sassc (2.4.0)
@@ -505,7 +505,7 @@ GEM
505505
net-ssh (>= 2.8.0)
506506
sshkit-interactive (0.3.0)
507507
sshkit (~> 1.12)
508-
strong_migrations (0.7.7)
508+
strong_migrations (0.7.8)
509509
activerecord (>= 5)
510510
terminal-notifier (2.0.0)
511511
terminal-notifier-guard (1.7.0)
@@ -521,20 +521,20 @@ GEM
521521
uglifier (4.2.0)
522522
execjs (>= 0.3.0, < 3)
523523
unicode-display_width (1.7.0)
524-
uniform_notifier (1.14.1)
524+
uniform_notifier (1.14.2)
525525
warden (1.2.9)
526526
rack (>= 2.0.9)
527527
web-console (4.1.0)
528528
actionview (>= 6.0.0)
529529
activemodel (>= 6.0.0)
530530
bindex (>= 0.4.0)
531531
railties (>= 6.0.0)
532-
webdrivers (4.6.0)
532+
webdrivers (4.6.1)
533533
nokogiri (~> 1.6)
534534
rubyzip (>= 1.3.0)
535535
selenium-webdriver (>= 3.0, < 4.0)
536-
webmock (3.12.2)
537-
addressable (>= 2.3.6)
536+
webmock (3.14.0)
537+
addressable (>= 2.8.0)
538538
crack (>= 0.3.2)
539539
hashdiff (>= 0.4.0, < 2.0.0)
540540
webpacker (5.4.0)
@@ -604,7 +604,7 @@ DEPENDENCIES
604604
knapsack_pro
605605
launchy
606606
letter_opener
607-
listen (~> 3.5.0)
607+
listen (~> 3.7.0)
608608
lograge
609609
magic_test
610610
mini_racer (~> 0.3.1)
@@ -624,7 +624,7 @@ DEPENDENCIES
624624
rails-erd
625625
rb-readline (~> 0.5.3)
626626
recaptcha
627-
rspec-rails (~> 5.0.1)
627+
rspec-rails (~> 5.0.2)
628628
rspec-sidekiq
629629
rubocop
630630
rubocop-rails (~> 2.9.1)
@@ -637,14 +637,14 @@ DEPENDENCIES
637637
spring
638638
spring-watcher-listen
639639
sprockets (~> 4.0.2)
640-
strong_migrations (~> 0.7.7)
640+
strong_migrations (~> 0.7.8)
641641
terminal-notifier
642642
terminal-notifier-guard
643643
toastr-rails
644644
uglifier (>= 1.3.0)
645645
web-console
646646
webdrivers (~> 4.6)
647-
webmock (~> 3.12)
647+
webmock (~> 3.14)
648648
webpacker (~> 5.4)
649649
yajl-ruby
650650

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,13 @@ Run `bundle exec rails server` or `bundle exec bin/start` (recommended since it
7070
### Login
7171
To login to the web application, use these default credentials:
7272

73-
**Diaperbase Users**
73+
**Super Users**
74+
```
75+
username: superadmin@example.com
76+
password: password
77+
```
78+
79+
**Bank users**
7480
```
7581
Organization Admin
7682
Email: org_admin1@example.com

0 commit comments

Comments
 (0)