Merge branch 'main' into fix-user-provided-redirect-vuln

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   erb_javascript_rails:
@@ -14,7 +14,7 @@ jobs:
       RAILS_ENV: test
     services:
       postgres:
-        image: postgres:10.5-alpine
+        image: postgres:14.8-alpine
         env:
           POSTGRES_USER: sm
           POSTGRES_PASSWORD: sm_password

Gemfile

@@ -28,7 +28,7 @@ gem 'meta-tags', '~> 2.11', '>= 2.11.1'
 gem 'active_model_serializers', '~> 0.10.9'
 gem 'premailer-rails', '~>1.10.3'
 gem 'gemoji'
-gem 'truncato'
+gem 'truncato', '~> 0.7.12'
 
 group :development, :test do
   gem 'byebug', platforms: %i[mri mingw x64_mingw]

Gemfile.lock

@@ -153,7 +153,7 @@ GEM
       nokogiri (~> 1)
       rake
     mini_mime (1.0.2)
-    mini_portile2 (2.8.2)
+    mini_portile2 (2.8.4)
     minitest (5.14.0)
     msgpack (1.7.1)
     multi_json (1.13.1)
@@ -297,7 +297,7 @@ GEM
     thor (1.0.1)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    truncato (0.7.11)
+    truncato (0.7.12)
       htmlentities (~> 4.3.1)
       nokogiri (>= 1.7.0, <= 2.0)
     turbolinks (5.2.0)
@@ -368,7 +368,7 @@ DEPENDENCIES
   spring-watcher-listen (~> 2.0.0)
   storyblok (~> 2.0.5)
   timecop (~> 0.9.1)
-  truncato
+  truncato (~> 0.7.12)
   turbolinks (~> 5.2)
   twitter_cldr (~> 4.4, >= 4.4.3)
   tzinfo-data

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   postgres:
-    image: 'postgres:10.5-alpine'
+    image: 'postgres:14.8-alpine'
     volumes:
       - 'pgdata:/var/lib/postgresql/data'
     environment: