From ef63e1325fd2028b711bab675c5d2a32b96519e0 Mon Sep 17 00:00:00 2001
From: Sven Fischer <git-dev@linux4tw.de>
Date: Fri, 6 Dec 2019 18:27:29 +0100
Subject: [PATCH 1/2] docker.apache: update php to 7.4, composer to 1.9.1, fix
 gd configure flags

w.r.t gd see also https://github.com/docker-library/php/issues/912
---
 contrib/docker/Dockerfile.apache | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache
index d6a364a51..7485a3f4e 100644
--- a/contrib/docker/Dockerfile.apache
+++ b/contrib/docker/Dockerfile.apache
@@ -1,7 +1,7 @@
-FROM php:7.3-apache-buster
+FROM php:7.4-apache-buster
 
-ARG COMPOSER_VERSION="1.8.5"
-ARG COMPOSER_CHECKSUM="4e4c1cd74b54a26618699f3190e6f5fc63bb308b13fa660f71f2a2df047c0e17"
+ARG COMPOSER_VERSION="1.9.1"
+ARG COMPOSER_CHECKSUM="1f210b9037fcf82670d75892dfc44400f13fe9ada7af9e787f93e50e3b764111"
 
 RUN apt-get update \
  && apt-get install -y --no-install-recommends apt-utils \
@@ -13,10 +13,10 @@ RUN apt-get update \
  && locale-gen && update-locale \
  && docker-php-source extract \
  && docker-php-ext-configure gd \
-      --enable-freetype \
-      --with-jpeg-dir=/usr/lib/x86_64-linux-gnu/ \
-      --with-xpm-dir=/usr/lib/x86_64-linux-gnu/ \
-      --with-webp-dir=/usr/lib/x86_64-linux-gnu/ \
+      --with-freetype \
+      --with-jpeg \
+      --with-webp \
+      --with-xpm \
  && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip curl \
  && pecl install imagick \
  && docker-php-ext-enable imagick pcntl imagick gd exif zip curl \

From 2238f18eedb93d51336381de38558ffb550889e8 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Fri, 6 Dec 2019 23:22:10 -0700
Subject: [PATCH 2/2] Update nav

---
 resources/views/layouts/partial/nav.blade.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php
index 74354bfd1..1f246f188 100644
--- a/resources/views/layouts/partial/nav.blade.php
+++ b/resources/views/layouts/partial/nav.blade.php
@@ -70,10 +70,12 @@
                                 <span class="far fa-bell pr-1"></span>
                                 Notifications
                             </a>
+                            <div class="dropdown-divider"></div>
                             <a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}">
                                 <span class="far fa-map pr-1"></span>
                                 {{__('navmenu.publicTimeline')}}
                             </a>
+                            <div class="dropdown-divider"></div>
                             <a class="dropdown-item font-weight-bold" href="{{route('settings')}}">
                                 <span class="fas fa-cog pr-1"></span>
                                 {{__('navmenu.settings')}}