Skip to content

Commit

Permalink
Merge branch 'dev' into pipeline/tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Splines committed Apr 27, 2024
2 parents d11dc2d + 2008d54 commit eb0a4b7
Show file tree
Hide file tree
Showing 44 changed files with 566 additions and 446 deletions.
29 changes: 0 additions & 29 deletions .github/PULL_REQUEST_TEMPLATE/feature.md

This file was deleted.

1 change: 0 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE/localizing.md

This file was deleted.

1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ coverage
/public/uploads

# Ignore environment variables
/config/app_environment_variables.rb
completed_initial_run
/public/uploads.zip
/public/pdfcomprezzor/pdfcomprezzor.wasm
Expand Down
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby "3.1.4"

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem "rails", "~> 7.0.4.3"
gem "rails", "~> 7.1.3"
# Use dalli for caching to memcached in production
gem "dalli", ">= 2.7"
# Ruby wrapper for UglifyJS JavaScript compressor
Expand Down Expand Up @@ -70,14 +70,14 @@ gem "erubis"
gem "exception_handler", "~> 0.8.0.0"
gem "faraday", "~> 1.8"
gem "fuzzy-string-match"
gem "globalize"
gem "globalize-accessors"
gem "html-pipeline", "~> 2.14"
gem "jquery-rails"
gem "jquery-ui-rails"
gem "js-routes", "1.4.9"
gem "kaminari"
gem "kaminari-i18n"
gem "kramdown-parser-gfm"
gem "mobility"
gem "net-smtp"
gem "pg"
gem "premailer-rails"
Expand All @@ -104,9 +104,9 @@ gem "trix-rails", require: "trix"
gem "webpacker", "~> 5.x"

group :development, :docker_development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem "listen", ">= 3.0.5", "< 3.2"
gem "listen", "~> 3.9"
gem "rails-erd"
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem "web-console", ">= 3.3.0"
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem "marcel"
Expand Down
Loading

0 comments on commit eb0a4b7

Please sign in to comment.