Merge pull request #4412 from pixelfed/staging

v0.11.7 🥳

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Release Notes
 
-## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.6...dev)
+## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.7...dev)
+-  ([](https://github.com/pixelfed/pixelfed/commit/))
+
+## [v0.11.7 (2023-05-24)](https://github.com/pixelfed/pixelfed/compare/v0.11.6...v0.11.7)
 
 ### API Changes
 - Added [/api/v1/followed_tags](https://docs.joinmastodon.org/methods/followed_tags/) api endpoint ([175a8486](https://github.com/pixelfed/pixelfed/commit/175a8486))

config/pixelfed.php

@@ -23,7 +23,7 @@ return [
 	| This value is the version of your Pixelfed instance.
 	|
 	*/
-	'version' => '0.11.6',
+	'version' => '0.11.7',
 
 	/*
 	|--------------------------------------------------------------------------

contrib/docker/start.apache.sh

@@ -5,11 +5,11 @@ cp -r storage.skel/* storage/
 chown -R www-data:www-data storage/ bootstrap/
 
 # Refresh the environment
+php artisan config:cache
 php artisan storage:link
 php artisan horizon:publish
 php artisan route:cache
 php artisan view:cache
-php artisan config:cache
 
 # Finally run Apache
 apache2-foreground

contrib/docker/start.fpm.sh

@@ -5,11 +5,11 @@ cp -r storage.skel/* storage/
 chown -R www-data:www-data storage/ bootstrap/
 
 # Refresh the environment
+php artisan config:cache
 php artisan storage:link
 php artisan horizon:publish
 php artisan route:cache
 php artisan view:cache
-php artisan config:cache
 
 # Finally run FPM
 php-fpm

resources/views/admin/diagnostics/home.blade.php

@@ -74,11 +74,11 @@
 		</li>
 		<li>
 			<strong><span class="badge badge-primary">OAUTH</span> public key exists: </strong>
-			<span>{{ file_exists(storage_path('oauth-public.key')) ? '✅ true' : '❌ false' }}</span>
+			<span>{{ file_exists(storage_path('oauth-public.key')) || config_cache('passport.public_key') ? '✅ true' : '❌ false' }}</span>
 		</li>
 		<li>
 			<strong><span class="badge badge-primary">OAUTH</span> private key exists: </strong>
-			<span>{{ file_exists(storage_path('oauth-private.key')) ? '✅ true' : '❌ false' }}</span>
+			<span>{{ file_exists(storage_path('oauth-private.key')) || config_cache('passport.private_key') ? '✅ true' : '❌ false' }}</span>
 		</li>		
 		
 		<hr>