UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 13:33:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1795 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2019-10-18 19:32:36 -06:00 committed by GitHub
commit 3f41feab3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Console/Commands/StatusDedupe.php
View file

@ -40,6 +40,11 @@ class StatusDedupe extends Command
*/ */
public function handle() 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') DB::table('statuses')
->selectRaw('id, uri, count(uri) as occurences') ->selectRaw('id, uri, count(uri) as occurences')
->whereNull('deleted_at') ->whereNull('deleted_at')

2
app/Services/EmailService.php
View file

File diff suppressed because one or more lines are too long