Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@excid3
excid3 committed Oct 12, 2023
2 parents 0705a0d + c4b364e commit 188a22d
Show file tree
Hide file tree
Showing 8 changed files with 182 additions and 921 deletions.
289 changes: 168 additions & 121 deletions Gemfile.lock
View file

Large diffs are not rendered by default.

122 changes: 2 additions & 120 deletions gemfiles/rails_5_2.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ GEM
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
erubi (1.12.0)
<<<<<<< HEAD
faraday (2.7.11)
base64
faraday-net_http (>= 2.0, < 3.1)
Expand All @@ -85,19 +84,6 @@ GEM
globalid (1.1.0)
activesupport (>= 5.0)
googleauth (1.8.1)
=======
faraday (2.7.3)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
ffi (1.15.5)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
globalid (1.0.1)
activesupport (>= 5.0)
googleauth (1.3.0)
>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
Expand All @@ -116,7 +102,6 @@ GEM
i18n (1.14.1)
concurrent-ruby (~> 1.0)
json (2.6.3)
<<<<<<< HEAD
jwt (2.7.1)
language_server-protocol (3.17.0.3)
lint_roller (1.1.0)
Expand All @@ -127,67 +112,31 @@ GEM
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
=======
jwt (2.6.0)
language_server-protocol (3.17.0.2)
llhttp-ffi (0.4.0)
ffi-compiler (~> 1.0)
rake (~> 13.0)
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.8.0.1)
>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
marcel (1.0.2)
method_source (1.0.0)
<<<<<<< HEAD
mini_mime (1.1.5)
mini_portile2 (2.8.4)
minitest (5.20.0)
=======
mini_mime (1.1.2)
mini_portile2 (2.8.1)
minitest (5.17.0)
>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555
multi_json (1.15.0)
mysql2 (0.5.5)
net-http2 (0.18.5)
http-2 (~> 0.11)
<<<<<<< HEAD
net-imap (0.4.1)
=======
net-imap (0.3.4)
>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
timeout
<<<<<<< HEAD
net-smtp (0.4.0)
net-protocol
nio4r (2.5.9)
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
=======
net-smtp (0.3.3)
net-protocol
nio4r (2.5.8)
nokogiri (1.14.0)
mini_portile2 (~> 2.8.0)
>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555
racc (~> 1.4)
nokogiri (1.14.0-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.14.0-x86_64-linux)
nokogiri (1.15.4-arm64-darwin)
racc (~> 1.4)
os (1.1.4)
<<<<<<< HEAD
parallel (1.23.0)
parser (3.2.2.4)
ast (~> 2.4.1)
Expand All @@ -197,16 +146,6 @@ GEM
racc (1.7.1)
rack (2.2.8)
rack-test (2.1.0)
=======
parallel (1.22.1)
parser (3.2.0.0)
ast (~> 2.4.1)
pg (1.4.5)
public_suffix (5.0.1)
racc (1.6.2)
rack (2.2.6.2)
rack-test (2.0.2)
>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555
rack (>= 1.3)
rails (5.2.8.1)
actioncable (= 5.2.8.1)
Expand All @@ -225,14 +164,9 @@ GEM
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
<<<<<<< HEAD
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
=======
rails-html-sanitizer (1.4.4)
loofah (~> 2.19, >= 2.19.1)
>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555
railties (5.2.8.1)
actionpack (= 5.2.8.1)
activesupport (= 5.2.8.1)
Expand All @@ -241,38 +175,23 @@ GEM
thor (>= 0.19.0, < 2.0)
rainbow (3.1.1)
rake (13.0.6)
<<<<<<< HEAD
regexp_parser (2.8.2)
rexml (3.2.6)
rubocop (1.56.4)
base64 (~> 0.1.1)
=======
regexp_parser (2.6.1)
rexml (3.2.5)
rubocop (1.42.0)
>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.3)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
<<<<<<< HEAD
rubocop-ast (>= 1.28.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.29.0)
parser (>= 3.2.1.0)
rubocop-performance (1.19.1)
=======
rubocop-ast (>= 1.24.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.24.1)
parser (>= 3.1.1.0)
rubocop-performance (1.15.2)
>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
ruby-progressbar (1.13.0)
Expand All @@ -282,20 +201,14 @@ GEM
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
<<<<<<< HEAD
sprockets (4.2.1)
=======
sprockets (4.2.0)
>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
<<<<<<< HEAD
sqlite3 (1.6.7)
mini_portile2 (~> 2.8.0)
sqlite3 (1.6.7-arm64-darwin)
standard (1.31.2)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
Expand All @@ -312,31 +225,12 @@ GEM
thread_safe (0.3.6)
timeout (0.4.0)
tzinfo (1.2.11)
=======
sqlite3 (1.6.0)
mini_portile2 (~> 2.8.0)
sqlite3 (1.6.0-x86_64-darwin)
sqlite3 (1.6.0-x86_64-linux)
standard (1.22.0)
language_server-protocol (~> 3.17.0.2)
rubocop (= 1.42.0)
rubocop-performance (= 1.15.2)
thor (1.2.1)
thread_safe (0.3.6)
timeout (0.3.1)
tzinfo (1.2.10)
>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
<<<<<<< HEAD
unicode-display_width (2.5.0)
webmock (3.19.1)
=======
unicode-display_width (2.4.2)
webmock (3.18.1)
>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
Expand All @@ -345,16 +239,8 @@ GEM
websocket-extensions (0.1.5)

PLATFORMS
<<<<<<< HEAD
arm64-darwin-21
arm64-darwin-22
x86_64-darwin-19
x86_64-darwin-20
x86_64-darwin-21
=======
ruby
x86_64-darwin-22
>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555
x86_64-linux

DEPENDENCIES
Expand All @@ -372,8 +258,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
<<<<<<< HEAD
2.4.20
=======
2.4.1
>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555
Loading

0 comments on commit 188a22d

Please sign in to comment.