Merge pull request #2530 from pixelfed/staging

Staging

CHANGELOG.md

@@ -144,6 +144,7 @@
 - Updated avatars, use jpeg default. ([f6528c84](https://github.com/pixelfed/pixelfed/commit/f6528c84))
 - Updated antispam bouncer, change recent from 1 week to 3 months. ([7d818197](https://github.com/pixelfed/pixelfed/commit/7d818197))
 - Updated Post components, fix remote post and profile urls. ([cfcf17f3](https://github.com/pixelfed/pixelfed/commit/cfcf17f3))
+- Update migrations, fix broken oauth change. ([4a885c88](https://github.com/pixelfed/pixelfed/commit/4a885c88))
 
 ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)
 ### Added

database/migrations/2020_12_13_203646_add_providers_column_to_oauth_clients_table.php

@@ -14,7 +14,9 @@ class AddProvidersColumnToOauthClientsTable extends Migration
     public function up()
     {
         Schema::table('oauth_clients', function (Blueprint $table) {
-            $table->string('provider')->after('secret')->nullable();
+            if(Schema::hasColumn('oauth_clients', 'provider') == false) {
+                $table->string('provider')->after('secret')->nullable();
+            }
         });
     }