Skip to content

Commit bba57bc

Browse files
authored
Merge branch 'master' into rails71
2 parents d8cc02a + 986142e commit bba57bc

File tree

189 files changed

+200
-477
lines changed

Some content is hidden

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

189 files changed

+200
-477
lines changed

.editorconfig

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# EditorConfig is awesome: https://editorconfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true
10+
indent_style = space
11+
indent_size = 2
12+
charset = utf-8
13+
14+
# Tab indentation (no size specified)
15+
[Makefile]
16+
indent_style = tab

.rspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
--color
2+
--require spec_helper

Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ ruby '3.4.4'
44
gem 'rails', '~> 7.1.5.1' # LOCKED: It is Rails.
55
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
66
gem 'sprockets-rails'
7-
# Reduces boot times through caching; required in config/boot.rb
8-
gem 'bootsnap', require: false
97

108
gem 'acts-as-taggable-on'
119
gem 'benchmark' # LOCKED: Added because of activesupport 7.0

Gemfile.lock

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ GEM
112112
bindex (0.8.1)
113113
binding_of_caller (1.0.1)
114114
debug_inspector (>= 1.2.0)
115-
bootsnap (1.18.6)
116-
msgpack (~> 1.2)
117115
bootstrap (5.3.5)
118116
popper_js (>= 2.11.8, < 3)
119117
builder (3.3.0)
@@ -155,7 +153,8 @@ GEM
155153
coffee-script-source
156154
execjs
157155
coffee-script-source (1.12.2)
158-
commonmarker (0.23.10)
156+
commonmarker (2.3.2)
157+
rb_sys (~> 0.9)
159158
concurrent-ruby (1.3.5)
160159
connection_pool (2.5.3)
161160
crass (1.0.6)
@@ -209,7 +208,7 @@ GEM
209208
thor
210209
tilt
211210
hashie (5.0.0)
212-
high_voltage (3.1.2)
211+
high_voltage (4.0.0)
213212
htmlentities (4.3.4)
214213
i18n (1.14.7)
215214
concurrent-ruby (~> 1.0)
@@ -271,7 +270,6 @@ GEM
271270
mini_mime (1.1.5)
272271
mini_portile2 (2.8.9)
273272
minitest (5.25.5)
274-
msgpack (1.8.0)
275273
multi_xml (0.6.0)
276274
mutex_m (0.3.0)
277275
net-http (0.6.0)
@@ -316,7 +314,7 @@ GEM
316314
ast (~> 2.4.1)
317315
racc
318316
pg (1.6.1)
319-
pickadate-rails (3.5.6.0)
317+
pickadate-rails (3.5.6.1)
320318
railties (>= 3.1.0)
321319
popper_js (2.11.8)
322320
pp (0.6.2)
@@ -408,9 +406,12 @@ GEM
408406
zeitwerk (~> 2.6)
409407
rainbow (3.1.1)
410408
rake (13.3.0)
409+
rake-compiler-dock (1.9.1)
411410
rb-fsevent (0.11.2)
412411
rb-inotify (0.10.1)
413412
ffi (~> 1.0)
413+
rb_sys (0.9.117)
414+
rake-compiler-dock (= 1.9.1)
414415
rdoc (6.14.2)
415416
erb
416417
psych (>= 4.0.0)
@@ -522,12 +523,11 @@ GEM
522523
terser (1.2.6)
523524
execjs (>= 0.3.0, < 3)
524525
thor (1.4.0)
525-
tilt (2.3.0)
526+
tilt (2.6.1)
526527
timecop (0.9.10)
527528
timeout (0.4.3)
528-
turbo-rails (1.5.0)
529+
turbo-rails (2.0.12)
529530
actionpack (>= 6.0.0)
530-
activejob (>= 6.0.0)
531531
railties (>= 6.0.0)
532532
tzinfo (2.0.6)
533533
concurrent-ruby (~> 1.0)
@@ -562,7 +562,6 @@ DEPENDENCIES
562562
better_errors
563563
bigdecimal
564564
binding_of_caller
565-
bootsnap
566565
bootstrap (~> 5)
567566
bullet
568567
capybara
-18.6 KB

app/assets/images/Icon-128.png

-1.68 KB

app/assets/images/Icon-196.png

-3.69 KB

app/assets/images/benevity-logo.png

-11.4 KB

app/assets/images/bg.jpg

-8.04 KB

app/assets/images/codebar-girl.gif

-314 KB

0 commit comments

Comments
 (0)