Merge pull request #1795 from pixelfed/staging

Staging
6 years ago · 3f41feab3a
parent e34f222240 723d3562be
commit 3f41feab3a
2 changed files with 6 additions and 1 deletions
--- a/app/Console/Commands/StatusDedupe.php
+++ b/app/Console/Commands/StatusDedupe.php
@ -40,6 +40,11 @@ class StatusDedupe extends Command
     */
    public function handle()
    {
+
+        if(config('database.default') == 'pgsql') {
+            $this->info('This command is not compatible with Postgres, we are working on a fix.');
+            return;
+        }
        DB::table('statuses')
            ->selectRaw('id, uri, count(uri) as occurences')
            ->whereNull('deleted_at')
--- a/app/Services/EmailService.php
+++ b/app/Services/EmailService.php