Skip to content

Commit 32afadb

Browse files
committed
Merge remote-tracking branch 'origin/main' into item-request
2 parents b298f9c + 3e76a21 commit 32afadb

File tree

132 files changed

+2124
-620
lines changed

Some content is hidden

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

132 files changed

+2124
-620
lines changed

.github/workflows/ruby_lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ jobs:
2727
- name: lint
2828
run: bundle exec rubocop
2929
- name: lint erb files
30-
run: bundle exec erblint --lint-all
30+
run: bundle exec erb_lint --lint-all

Gemfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ gem "turbo-rails"
5151
# Sprinkle a little JS to add interactivity
5252
gem "stimulus-rails"
5353
# Use JS import maps to manage JS without transpiling or bundling.
54-
gem "importmap-rails", "~> 2.1"
54+
gem "importmap-rails", "~> 2.2"
5555

5656
##### VIEWS/CONTROLLERS #####
5757

@@ -61,6 +61,8 @@ gem "filterrific"
6161
gem "jbuilder"
6262
# Pagination of models for use in views.
6363
gem "kaminari"
64+
# Prevents cookie overflow errors when storing large flash messages.
65+
gem 'memflash'
6466
# Web-based authorization framework.
6567
gem "omniauth"
6668
# Required to avoid authentication issues with Rails.
@@ -107,6 +109,9 @@ gem 'bootsnap', require: false
107109
# specific versions for compatibility reasons.
108110
gem "nokogiri", ">= 1.10.4"
109111
gem "sprockets", "~> 4.2.2"
112+
gem "prawn", "~> 2.4.0"
113+
gem "matrix" # Used by prawn
114+
gem "ttfunk", "~>1.7.0"
110115

111116
group :production, :staging do
112117
# Reduce the noise of logs and include custom fields to it for easier access
@@ -153,7 +158,7 @@ group :development, :test do
153158
# More concise test ("should") matchers
154159
gem "shoulda-matchers", "~> 6.5"
155160
# Default rules for Rubocop.
156-
gem "standard", "~> 1.40"
161+
gem "standard", "~> 1.50"
157162
gem "standard-rails"
158163
gem "standard-performance"
159164
# Erb linter.

0 commit comments

Comments
 (0)