diff --git a/.gitattributes b/.gitattributes
index d49e00b1b..8c9dcf505 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,6 +2,7 @@
* text eol=lf
# Denote all files that are truly binary and should not be modified.
+*.jpg binary
*.png binary
*.ico binary
*.gif binary
diff --git a/Gemfile b/Gemfile
index 1e48694db..c97d4a8eb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,10 +1,10 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-ruby '3.1.2'
+ruby '3.1.4'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem "rails", "~> 7.0.2.3"
+gem "rails", "~> 7.0.4.3"
# Use dalli for caching to memcached in production
gem "dalli", ">= 2.7"
# Ruby wrapper for UglifyJS JavaScript compressor
@@ -71,13 +71,11 @@ gem "acts_as_tree"
gem "activerecord-import",
git: "https://github.com/zdennis/activerecord-import.git",
branch: "master"
-gem "thredded",
- git: "https://github.com/MaMpf-HD/thredded.git",
- branch: "master"
+gem "thredded"
gem "kramdown-parser-gfm"
gem "thredded-markdown_katex",
- github: "thredded/thredded-markdown_katex",
- branch: "master"
+ git: "https://github.com/thredded/thredded-markdown_katex.git",
+ branch: "main"
gem "rails-i18n"
gem "kaminari-i18n"
gem "trix-rails", require: "trix"
diff --git a/Gemfile.lock b/Gemfile.lock
index 31672fe6e..20db4c33d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,36 +8,9 @@ GIT
sprockets-rails
will_paginate
-GIT
- remote: https://github.com/MaMpf-HD/thredded.git
- revision: e41338d5dea7bb31a7d850bfcdd0a1ba552fd041
- branch: master
- specs:
- thredded (1.0.0)
- active_record_union (>= 1.3.0)
- autoprefixer-rails
- db_text_search
- friendly_id
- html-pipeline (< 2.14.1)
- htmlentities
- inline_svg (>= 1.6.0)
- kaminari
- kramdown (>= 2.0.0)
- kramdown-parser-gfm
- nokogiri
- onebox (>= 1.8.99)
- pundit (>= 1.1.0)
- rails (>= 4.2.10, != 6.0.0.rc2)
- rails_gravatar
- rinku
- sanitize
- sassc-rails (>= 2.0.0)
- sprockets-es6
- timeago_js (>= 3.0.2.2)
-
GIT
remote: https://github.com/rails/sprockets-rails
- revision: 7137bb169839596b4a84b16173d021de5f988a1e
+ revision: 73e7351abff3506f6dca6b2da8abedfd5c7c0d77
branch: master
specs:
sprockets-rails (3.4.2)
@@ -47,17 +20,17 @@ GIT
GIT
remote: https://github.com/sunspot/sunspot.git
- revision: f2f01a6278030d086e0efb141dceefdcca8932bd
+ revision: 414a59413cb7333ba4b2cc7bc23a625c7a965e03
glob: sunspot_rails/*.gemspec
specs:
- sunspot_rails (2.5.0)
+ sunspot_rails (2.6.0)
rails (>= 3)
- sunspot (= 2.5.0)
+ sunspot (= 2.6.0)
GIT
remote: https://github.com/thredded/thredded-markdown_katex.git
- revision: 051714990bde7ad25a136f4f4e75753803b98279
- branch: master
+ revision: e2830bdb40880018a0e59d2b82c94b0a9f237365
+ branch: main
specs:
thredded-markdown_katex (1.0.0)
katex (>= 0.4.3)
@@ -65,60 +38,60 @@ GIT
GIT
remote: https://github.com/zdennis/activerecord-import.git
- revision: 74ea5b1f2f6a9c1e958bff1e29eb46de32860735
+ revision: 748309d1ae03fc1fe56d58e54c634a003408c706
branch: master
specs:
- activerecord-import (1.4.0)
+ activerecord-import (1.4.1)
activerecord (>= 4.2)
GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.1.0)
- RubyInline (3.12.5)
+ RubyInline (3.13.0)
ZenTest (~> 4.3)
ZenTest (4.12.1)
- actioncable (7.0.2.4)
- actionpack (= 7.0.2.4)
- activesupport (= 7.0.2.4)
+ actioncable (7.0.4.3)
+ actionpack (= 7.0.4.3)
+ activesupport (= 7.0.4.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailbox (7.0.2.4)
- actionpack (= 7.0.2.4)
- activejob (= 7.0.2.4)
- activerecord (= 7.0.2.4)
- activestorage (= 7.0.2.4)
- activesupport (= 7.0.2.4)
+ actionmailbox (7.0.4.3)
+ actionpack (= 7.0.4.3)
+ activejob (= 7.0.4.3)
+ activerecord (= 7.0.4.3)
+ activestorage (= 7.0.4.3)
+ activesupport (= 7.0.4.3)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
- actionmailer (7.0.2.4)
- actionpack (= 7.0.2.4)
- actionview (= 7.0.2.4)
- activejob (= 7.0.2.4)
- activesupport (= 7.0.2.4)
+ actionmailer (7.0.4.3)
+ actionpack (= 7.0.4.3)
+ actionview (= 7.0.4.3)
+ activejob (= 7.0.4.3)
+ activesupport (= 7.0.4.3)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
- actionpack (7.0.2.4)
- actionview (= 7.0.2.4)
- activesupport (= 7.0.2.4)
+ actionpack (7.0.4.3)
+ actionview (= 7.0.4.3)
+ activesupport (= 7.0.4.3)
rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (7.0.2.4)
- actionpack (= 7.0.2.4)
- activerecord (= 7.0.2.4)
- activestorage (= 7.0.2.4)
- activesupport (= 7.0.2.4)
+ actiontext (7.0.4.3)
+ actionpack (= 7.0.4.3)
+ activerecord (= 7.0.4.3)
+ activestorage (= 7.0.4.3)
+ activesupport (= 7.0.4.3)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
- actionview (7.0.2.4)
- activesupport (= 7.0.2.4)
+ actionview (7.0.4.3)
+ activesupport (= 7.0.4.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
@@ -130,69 +103,67 @@ GEM
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
active_record_union (1.3.0)
activerecord (>= 4.0)
- activejob (7.0.2.4)
- activesupport (= 7.0.2.4)
+ activejob (7.0.4.3)
+ activesupport (= 7.0.4.3)
globalid (>= 0.3.6)
- activemodel (7.0.2.4)
- activesupport (= 7.0.2.4)
- activerecord (7.0.2.4)
- activemodel (= 7.0.2.4)
- activesupport (= 7.0.2.4)
- activerecord-nulldb-adapter (0.8.0)
+ activemodel (7.0.4.3)
+ activesupport (= 7.0.4.3)
+ activerecord (7.0.4.3)
+ activemodel (= 7.0.4.3)
+ activesupport (= 7.0.4.3)
+ activerecord-nulldb-adapter (0.9.0)
activerecord (>= 5.2.0, < 7.1)
- activestorage (7.0.2.4)
- actionpack (= 7.0.2.4)
- activejob (= 7.0.2.4)
- activerecord (= 7.0.2.4)
- activesupport (= 7.0.2.4)
+ activestorage (7.0.4.3)
+ actionpack (= 7.0.4.3)
+ activejob (= 7.0.4.3)
+ activerecord (= 7.0.4.3)
+ activesupport (= 7.0.4.3)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
- activesupport (7.0.2.4)
+ activesupport (7.0.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
- acts_as_list (1.0.4)
+ acts_as_list (1.1.0)
activerecord (>= 4.2)
acts_as_tree (2.9.1)
activerecord (>= 3.0.0)
- acts_as_votable (0.13.2)
- addressable (2.8.0)
- public_suffix (>= 2.0.2, < 5.0)
+ acts_as_votable (0.14.0)
+ addressable (2.8.2)
+ public_suffix (>= 2.0.2, < 6.0)
afm (0.2.2)
ast (2.4.2)
- autoprefixer-rails (10.4.7.0)
+ autoprefixer-rails (10.4.13.0)
execjs (~> 2)
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
barby (0.6.8)
- bcrypt (3.1.17)
- better_html (1.0.16)
- actionview (>= 4.0)
- activesupport (>= 4.0)
+ bcrypt (3.1.18)
+ better_html (2.0.1)
+ actionview (>= 6.0)
+ activesupport (>= 6.0)
ast (~> 2.0)
erubi (~> 1.4)
- html_tokenizer (~> 0.0.6)
parser (>= 2.4)
smart_properties
bindex (0.8.1)
- bootsnap (1.11.1)
+ bootsnap (1.16.0)
msgpack (~> 1.2)
- bootstrap (4.6.1)
+ bootstrap (4.6.2)
autoprefixer-rails (>= 9.1.0)
- popper_js (>= 1.14.3, < 2)
+ popper_js (>= 1.16.1, < 2)
sassc-rails (>= 2.0.0)
- bootstrap_form (5.0.0)
+ bootstrap_form (5.1.0)
actionpack (>= 5.2)
activemodel (>= 5.2)
builder (3.2.4)
byebug (11.1.3)
- cancancan (3.3.0)
+ cancancan (3.5.0)
case_transform (0.2)
activesupport
- childprocess (4.1.0)
choice (0.2.0)
chunky_png (1.4.0)
clipboard-rails (1.7.1)
@@ -203,8 +174,8 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
- concurrent-ruby (1.1.10)
- connection_pool (2.2.5)
+ concurrent-ruby (1.2.2)
+ connection_pool (2.4.0)
content_disposition (1.0.0)
coveralls (0.7.1)
multi_json (~> 1.3)
@@ -213,20 +184,21 @@ GEM
term-ansicolor
thor
crass (1.0.6)
- css_parser (1.11.0)
+ css_parser (1.14.0)
addressable
- cypress-on-rails (1.12.1)
+ cypress-on-rails (1.13.1)
rack
- dalli (3.2.1)
- database_cleaner (2.0.1)
- database_cleaner-active_record (~> 2.0.0)
- database_cleaner-active_record (2.0.1)
+ dalli (3.2.4)
+ database_cleaner (2.0.2)
+ database_cleaner-active_record (>= 2, < 3)
+ database_cleaner-active_record (2.1.0)
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
+ date (3.3.3)
db_text_search (1.0.0)
activerecord (>= 4.1.15)
- devise (4.8.1)
+ devise (4.9.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
@@ -234,21 +206,19 @@ GEM
warden (~> 1.2.3)
devise-bootstrap-views (1.1.0)
diff-lcs (1.5.0)
- digest (3.1.0)
docile (1.4.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
- down (5.3.1)
+ down (5.4.0)
addressable (~> 2.8)
- erb_lint (0.1.1)
+ erb_lint (0.4.0)
activesupport
- better_html (~> 1.0.7)
- html_tokenizer
+ better_html (>= 2.0.1)
parser (>= 2.7.1.4)
rainbow
rubocop
smart_properties
- erubi (1.10.0)
+ erubi (1.12.0)
erubis (2.7.0)
et-orbi (1.2.7)
tzinfo
@@ -262,9 +232,9 @@ GEM
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
- faker (2.20.0)
+ faker (3.1.1)
i18n (>= 1.8.11, < 2)
- faraday (1.10.0)
+ faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
@@ -280,8 +250,8 @@ GEM
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
- faraday-multipart (1.0.3)
- multipart-post (>= 1.2, < 3)
+ faraday-multipart (1.0.4)
+ multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
@@ -290,44 +260,42 @@ GEM
fastimage (2.2.6)
ffi (1.15.5)
filesize (0.2.0)
- friendly_id (5.4.2)
+ friendly_id (5.5.0)
activerecord (>= 4.0.0)
- fugit (1.5.3)
+ fugit (1.8.1)
et-orbi (~> 1, >= 1.2.7)
raabro (~> 1.4)
fuzzy-string-match (1.0.1)
RubyInline (>= 3.8.6)
- generator (0.0.1)
- globalid (1.0.0)
+ globalid (1.1.0)
activesupport (>= 5.0)
- globalize (6.1.0)
+ globalize (6.2.1)
activemodel (>= 4.2, < 7.1)
activerecord (>= 4.2, < 7.1)
request_store (~> 1.0)
globalize-accessors (0.3.0)
globalize (>= 5.0.0)
hashery (2.1.2)
- highline (2.0.3)
- html-pipeline (2.14.0)
+ highline (2.1.0)
+ html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
- html_tokenizer (0.0.7)
htmlentities (4.3.4)
http-accept (1.7.0)
- http-cookie (1.0.4)
+ http-cookie (1.0.5)
domain_name (~> 0.5)
- i18n (1.10.0)
+ i18n (1.12.0)
concurrent-ruby (~> 1.0)
image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
- inline_svg (1.8.0)
+ inline_svg (1.9.0)
activesupport (>= 3.0)
nokogiri (>= 1.6)
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
- jquery-rails (4.4.0)
+ jquery-rails (4.5.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
@@ -361,46 +329,43 @@ GEM
kramdown (~> 2.0)
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
- launchy (2.5.0)
- addressable (~> 2.7)
- lazy_priority_queue (0.1.1)
+ launchy (2.5.2)
+ addressable (~> 2.8)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
- loofah (2.18.0)
+ loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
- mail (2.7.1)
+ mail (2.8.1)
mini_mime (>= 0.1.1)
+ net-imap
+ net-pop
+ net-smtp
marcel (1.0.2)
method_source (1.0.0)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
- mime-types-data (3.2022.0105)
- mini_magick (4.11.0)
+ mime-types-data (3.2023.0218.1)
+ mini_magick (4.12.0)
mini_mime (1.1.2)
- minitest (5.15.0)
- msgpack (1.5.1)
+ minitest (5.18.0)
+ msgpack (1.7.0)
multi_json (1.15.0)
- multipart-post (2.1.1)
+ multipart-post (2.3.0)
mustache (1.1.1)
- net-imap (0.2.3)
- digest
+ net-imap (0.3.4)
+ date
net-protocol
- strscan
- net-pop (0.1.1)
- digest
+ net-pop (0.1.2)
net-protocol
+ net-protocol (0.2.1)
timeout
- net-protocol (0.1.3)
- timeout
- net-smtp (0.3.1)
- digest
+ net-smtp (0.3.3)
net-protocol
- timeout
netrc (0.11.0)
nio4r (2.5.8)
- nokogiri (1.13.6-x86_64-linux)
+ nokogiri (1.14.2-x86_64-linux)
racc (~> 1.4)
onebox (2.2.19)
addressable (~> 2.8.0)
@@ -411,125 +376,129 @@ GEM
sanitize
options (2.3.2)
orm_adapter (0.5.0)
+ pairing_heap (3.0.0)
parallel (1.22.1)
- parser (3.1.2.0)
+ parser (3.2.2.0)
ast (~> 2.4.1)
- pdf-reader (2.10.0)
+ pdf-reader (2.11.0)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
hashery (~> 2.0)
ruby-rc4
ttfunk
- pg (1.3.5)
+ pg (1.4.6)
pgreset (0.3)
- popper_js (1.16.0)
+ popper_js (1.16.1)
pr_geohash (1.0.0)
- premailer (1.16.0)
+ premailer (1.21.0)
addressable
- css_parser (>= 1.6.0)
+ css_parser (>= 1.12.0)
htmlentities (>= 4.0.0)
- premailer-rails (1.11.1)
+ premailer-rails (1.12.0)
actionmailer (>= 3)
+ net-smtp
premailer (~> 1.7, >= 1.7.9)
progress_bar (1.3.3)
highline (>= 1.6, < 3)
options (~> 2.3.0)
- prometheus_exporter (2.0.2)
+ prometheus_exporter (2.0.8)
webrick
- public_suffix (4.0.7)
+ public_suffix (5.0.1)
puma (4.3.12)
nio4r (~> 2.0)
- pundit (2.2.0)
+ pundit (2.3.0)
activesupport (>= 3.0.0)
raabro (1.4.0)
- racc (1.6.0)
- rack (2.2.3)
- rack-proxy (0.7.2)
+ racc (1.6.2)
+ rack (2.2.6.4)
+ rack-proxy (0.7.6)
rack
- rack-test (1.1.0)
- rack (>= 1.0, < 3)
- rails (7.0.2.4)
- actioncable (= 7.0.2.4)
- actionmailbox (= 7.0.2.4)
- actionmailer (= 7.0.2.4)
- actionpack (= 7.0.2.4)
- actiontext (= 7.0.2.4)
- actionview (= 7.0.2.4)
- activejob (= 7.0.2.4)
- activemodel (= 7.0.2.4)
- activerecord (= 7.0.2.4)
- activestorage (= 7.0.2.4)
- activesupport (= 7.0.2.4)
+ rack-test (2.1.0)
+ rack (>= 1.3)
+ rails (7.0.4.3)
+ actioncable (= 7.0.4.3)
+ actionmailbox (= 7.0.4.3)
+ actionmailer (= 7.0.4.3)
+ actionpack (= 7.0.4.3)
+ actiontext (= 7.0.4.3)
+ actionview (= 7.0.4.3)
+ activejob (= 7.0.4.3)
+ activemodel (= 7.0.4.3)
+ activerecord (= 7.0.4.3)
+ activestorage (= 7.0.4.3)
+ activesupport (= 7.0.4.3)
bundler (>= 1.15.0)
- railties (= 7.0.2.4)
+ railties (= 7.0.4.3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
- rails-erd (1.6.1)
+ rails-erd (1.7.2)
activerecord (>= 4.2)
activesupport (>= 4.2)
choice (~> 0.2.0)
ruby-graphviz (~> 1.2)
- rails-html-sanitizer (1.4.2)
- loofah (~> 2.3)
- rails-i18n (7.0.3)
+ rails-html-sanitizer (1.5.0)
+ loofah (~> 2.19, >= 2.19.1)
+ rails-i18n (7.0.6)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
rails_gravatar (1.0.4)
actionview
- railties (7.0.2.4)
- actionpack (= 7.0.2.4)
- activesupport (= 7.0.2.4)
+ railties (7.0.4.3)
+ actionpack (= 7.0.4.3)
+ activesupport (= 7.0.4.3)
method_source
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.0.6)
- rb-fsevent (0.11.1)
+ rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
- redis (4.6.0)
- regexp_parser (2.4.0)
+ redis-client (0.14.1)
+ connection_pool
+ regexp_parser (2.7.0)
request_store (1.5.1)
rack (>= 1.4)
- responders (3.0.1)
- actionpack (>= 5.0)
- railties (>= 5.0)
+ responders (3.1.0)
+ actionpack (>= 5.2)
+ railties (>= 5.2)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.2.5)
- rgl (0.5.7)
- lazy_priority_queue (~> 0.1.0)
+ rgl (0.6.2)
+ pairing_heap (>= 0.3.0)
+ rexml (~> 3.2, >= 3.2.4)
stream (~> 0.5.3)
rinku (2.0.6)
- rqrcode (2.1.1)
+ rqrcode (2.1.2)
chunky_png (~> 1.0)
rqrcode_core (~> 1.0)
rqrcode_core (1.2.0)
rsolr (2.5.0)
builder (>= 2.1.2)
faraday (>= 0.9, < 3, != 2.0.0)
- rspec-core (3.11.0)
- rspec-support (~> 3.11.0)
- rspec-expectations (3.11.0)
+ rspec-core (3.12.1)
+ rspec-support (~> 3.12.0)
+ rspec-expectations (3.12.2)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.11.0)
- rspec-mocks (3.11.1)
+ rspec-support (~> 3.12.0)
+ rspec-mocks (3.12.5)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.11.0)
- rspec-rails (5.1.2)
- actionpack (>= 5.2)
- activesupport (>= 5.2)
- railties (>= 5.2)
- rspec-core (~> 3.10)
- rspec-expectations (~> 3.10)
- rspec-mocks (~> 3.10)
- rspec-support (~> 3.10)
- rspec-support (3.11.0)
+ rspec-support (~> 3.12.0)
+ rspec-rails (6.0.1)
+ actionpack (>= 6.1)
+ activesupport (>= 6.1)
+ railties (>= 6.1)
+ rspec-core (~> 3.11)
+ rspec-expectations (~> 3.11)
+ rspec-mocks (~> 3.11)
+ rspec-support (~> 3.11)
+ rspec-support (3.12.0)
rubocop (0.93.1)
parallel (~> 1.10)
parser (>= 2.7.1.5)
@@ -539,8 +508,8 @@ GEM
rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
- rubocop-ast (1.17.0)
- parser (>= 3.1.1.0)
+ rubocop-ast (1.28.0)
+ parser (>= 3.2.1.0)
rubocop-packaging (0.5.1)
rubocop (>= 0.89, < 2.0)
rubocop-performance (1.10.2)
@@ -552,13 +521,13 @@ GEM
rubocop (>= 0.90.0, < 2.0)
ruby-graphviz (1.2.5)
rexml
- ruby-progressbar (1.11.0)
+ ruby-progressbar (1.13.0)
ruby-rc4 (0.1.5)
ruby-vips (2.1.4)
ffi (~> 1.12)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
- sanitize (6.0.0)
+ sanitize (6.0.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
sass-rails (6.0.0)
@@ -571,22 +540,24 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
- selenium-webdriver (4.1.0)
- childprocess (>= 0.5, < 5.0)
+ selenium-webdriver (4.8.6)
rexml (~> 3.2, >= 3.2.5)
- rubyzip (>= 1.2.2)
+ rubyzip (>= 1.2.2, < 3.0)
+ websocket (~> 1.0)
semantic_range (3.0.0)
shrine (3.4.0)
content_disposition (~> 1.0)
down (~> 5.1)
- sidekiq (6.4.2)
- connection_pool (>= 2.2.2)
- rack (~> 2.0)
- redis (>= 4.2.0)
- sidekiq-cron (1.4.0)
- fugit (~> 1)
- sidekiq (>= 4.2.1)
- simplecov (0.21.2)
+ sidekiq (7.0.7)
+ concurrent-ruby (< 2)
+ connection_pool (>= 2.3.0)
+ rack (>= 2.2.4)
+ redis-client (>= 0.11.0)
+ sidekiq-cron (1.10.0)
+ fugit (~> 1.8)
+ globalid (>= 1.0.1)
+ sidekiq (>= 6)
+ simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
@@ -600,31 +571,50 @@ GEM
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
- sprockets (4.0.3)
+ sprockets (4.2.0)
concurrent-ruby (~> 1.0)
- rack (> 1, < 3)
+ rack (>= 2.2.4, < 4)
sprockets-es6 (0.9.2)
babel-source (>= 5.8.11)
babel-transpiler
sprockets (>= 3.0.0)
- sqlite3 (1.4.2)
- stream (0.5.3)
- generator
+ sqlite3 (1.6.2-x86_64-linux)
+ stream (0.5.5)
streamio-ffmpeg (3.0.2)
multi_json (~> 1.8)
- strscan (3.0.3)
- sunspot (2.5.0)
+ sunspot (2.6.0)
pr_geohash (~> 1.0)
rsolr (>= 1.1.1, < 3)
- sunspot_solr (2.5.0)
+ sunspot_solr (2.6.0)
sync (0.5.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (1.2.1)
- tilt (2.0.10)
+ thredded (1.1.0)
+ active_record_union (>= 1.3.0)
+ autoprefixer-rails
+ db_text_search
+ friendly_id
+ html-pipeline (>= 2.14.1)
+ htmlentities
+ inline_svg (>= 1.6.0)
+ kaminari
+ kramdown (>= 2.0.0)
+ kramdown-parser-gfm
+ nokogiri
+ onebox (>= 1.8.99)
+ pundit (>= 1.1.0)
+ rails (> 6.0.0.rc2)
+ rails_gravatar
+ rinku
+ sanitize
+ sassc-rails (>= 2.0.0)
+ sprockets-es6
+ timeago_js (>= 3.0.2.2)
+ tilt (2.1.0)
timeago_js (3.0.2.2)
- timeout (0.2.0)
- tins (1.31.1)
+ timeout (0.3.2)
+ tins (1.32.1)
sync
trix-rails (2.4.0)
rails (> 4.1)
@@ -632,13 +622,13 @@ GEM
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
- tzinfo (2.0.4)
+ tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
- unf_ext (0.0.8.1)
+ unf_ext (0.0.8.2)
unicode-display_width (1.8.0)
warden (1.2.9)
rack (>= 2.0.9)
@@ -647,21 +637,22 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
- webdrivers (5.0.0)
+ webdrivers (5.2.0)
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
selenium-webdriver (~> 4.0)
- webpacker (5.4.3)
+ webpacker (5.4.4)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
- webrick (1.7.0)
+ webrick (1.8.1)
+ websocket (1.2.9)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
will_paginate (3.3.1)
- zeitwerk (2.5.4)
+ zeitwerk (2.6.7)
PLATFORMS
x86_64-linux
@@ -720,7 +711,7 @@ DEPENDENCIES
prometheus_exporter
puma (~> 4.1)
rack
- rails (~> 7.0.2.3)
+ rails (~> 7.0.4.3)
rails-erd
rails-i18n
responders
@@ -746,7 +737,7 @@ DEPENDENCIES
streamio-ffmpeg
sunspot_rails!
sunspot_solr
- thredded!
+ thredded
thredded-markdown_katex!
trix-rails
turbolinks (~> 5)
@@ -756,7 +747,7 @@ DEPENDENCIES
webpacker (~> 5.x)
RUBY VERSION
- ruby 3.1.2p20
+ ruby 3.1.4p223
BUNDLED WITH
2.3.13
diff --git a/INSTALL.md b/INSTALL.md
index 5f8cee666..f495db02f 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,27 +1,25 @@
-## Installation (with docker-compose)
+## Installation (with docker compose)
-To simply try out mampf you can use `docker-compose` ([needs docker](https://docs.docker.com/engine/install/ubuntu/) && `apt install docker-compose`). Simply clone the mampf repository and run docker-compose by executing
+To simply try out mampf you can use `docker compose` (needs [Docker](https://docs.docker.com/engine/install/) and [Docker Compose](https://docs.docker.com/compose/install/)). Simply clone the MaMpf repository and run docker compose by executing
```
$ git clone -b main --recursive https://github.com/MaMpf-HD/mampf.git
-
$ cd mampf/docker/development/
-# docker-compose up
+# docker compose up
```
-NOTE: Please make sure to clone recursively as the pdf compression feature is in an extra repository.
-If you have an already checked out version simply run:
+NOTE: Please make sure to clone recursively as the pdf compression feature is in a separate repository.
-```sh
-git submodule init
-git submodule update
+If you have an already checked out version simply run:
+```
+git submodule update --init
```
You now have the following things ready:
-* The MaMpf server on localhost:3000
-* The mailcatcher service on localhost:1080
-* The webinterface for ApacheSolr on localhost:8983
+* The MaMpf server on [localhost:3000](http://localhost:3000/)
+* The mailcatcher service on [localhost:1080](http://localhost:1080/)
+* The webinterface for ApacheSolr on [localhost:8983](http://localhost:8983/)
* A test mailserver instance on Ports 1025, 10143, 10993
-* A webpacker dev server on localhost:3035
+* A webpacker dev server on [localhost:3035](http://localhost:3035/)
### Database setup
@@ -38,7 +36,7 @@ After setting up everything you can call the MaMpf Server on here and extract the .zip file into the `public/` folder of your project directory.
@@ -65,22 +63,22 @@ all assets have to provided.
2. visit the mailcatcher webinterface and confirm your account
3. make your account admin
```
- # docker-compose exec mampf rails r "User.first.update(admin: true)"
+ # docker compose exec mampf rails r "User.first.update(admin: true)"
```
4. There you go :tada:
-### Common docker-compose commands
+### Common docker compose commands
-A few common commands for `docker-compose` are:
+A few common commands for `docker compose` are:
| command | action |
| ---------------------------------- | -------------------------------------------------------------- |
-| `docker-compose up` | runs the mampf stack |
-| `docker-compose up -d` | runs the mampf stack in the background |
-| `docker-compose logs -f` | shows you continuous logs from the container |
-| `docker-compose down` | deletes all the created containers |
-| `docker-compose down --volumes` | deletes all the associated containers and volumes (full reset) |
-| `docker-compose exec mampf
+
-## About
+ Mathematische MedienplattformMaMpf
+