Merge remote-tracking branch 'upstream/master'

derpibooru · Aug 14, 2024 · ec94292 · ec94292
2 parents 25353b9 + 70145f3
commit ec94292
Show file tree

Hide file tree

Showing 7 changed files with 443 additions and 440 deletions.
diff --git a/assets/css/views/_commissions.scss b/assets/css/views/_commissions.scss
@@ -31,8 +31,8 @@
 }
 
 .commission__listing__body_text {
-  img { max-width: 100%; }
   word-wrap: break-word;
   margin-top: 3px;
   margin-bottom: 6px;
+  img { max-width: 100%; }
 }
diff --git a/assets/css/views/_communications.scss b/assets/css/views/_communications.scss
@@ -26,11 +26,11 @@ span.communication__body__sender-name {
 }
 
 .communication__body__text {
-  img { max-width: 100%; }
   word-wrap: break-word;
   margin-top: 3px;
   margin-bottom: 6px;
   line-height: 1.35em;
+  img { max-width: 100%; }
 }
 
 span.communication__sender__stats,

diff --git a/assets/js/settings.ts b/assets/js/settings.ts
@@ -10,7 +10,7 @@ export function setupSettings() {
   if (!$('#js-setting-table')) return;
 
   const localCheckboxes = $$<HTMLInputElement>('[data-tab="local"] input[type="checkbox"]');
-  const themeSelect = assertNotNull($<HTMLSelectElement>('#user_theme'));
+  const themeSelect = $<HTMLSelectElement>('#user_theme');
   const styleSheet = assertNotNull($<HTMLLinkElement>('head link[rel="stylesheet"]'));
 
   // Local settings

diff --git a/assets/package-lock.json b/assets/package-lock.json
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -59,7 +59,7 @@ services:
       - '5173:5173'
 
   postgres:
-    image: postgres:16.3-alpine
+    image: postgres:16.4-alpine
     environment:
       - POSTGRES_PASSWORD=postgres
     volumes:
@@ -68,7 +68,7 @@ services:
       driver: "none"
 
   opensearch:
-    image: opensearchproject/opensearch:2.15.0
+    image: opensearchproject/opensearch:2.16.0
     volumes:
       - opensearch_data:/usr/share/opensearch/data
       - ./docker/opensearch/opensearch.yml:/usr/share/opensearch/config/opensearch.yml
@@ -80,12 +80,12 @@ services:
         hard: 65536
 
   valkey:
-    image: valkey/valkey:7.2.5-alpine
+    image: valkey/valkey:8.0-alpine
     logging:
       driver: "none"
 
   files:
-    image: andrewgaul/s3proxy:sha-4175022
+    image: andrewgaul/s3proxy:sha-4976e17
     environment:
       - JCLOUDS_FILESYSTEM_BASEDIR=/srv/philomena/priv/s3
     volumes:

diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
@@ -1,4 +1,4 @@
-FROM elixir:1.17-alpine
+FROM elixir:1.17.2-alpine
 
 ADD https://api.github.com/repos/philomena-dev/FFmpeg/git/refs/heads/release/6.1 /tmp/ffmpeg_version.json
 RUN (echo "https://github.com/philomena-dev/prebuilt-ffmpeg/raw/master"; cat /etc/apk/repositories) > /tmp/repositories \

diff --git a/mix.lock b/mix.lock