Skip to content

Commit

Permalink
Merge pull request #457 from MaMpf-HD/mampf-next
Browse files Browse the repository at this point in the history
Release of version 1.4.4
  • Loading branch information
Splines authored Apr 14, 2023
2 parents 03493db + 7d05005 commit 16ad954
Show file tree
Hide file tree
Showing 37 changed files with 1,092 additions and 706 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 5 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"
Expand Down
Loading

0 comments on commit 16ad954

Please sign in to comment.