Merge pull request #1884 from pixelfed/staging

Update CollectionController, increase collection limit from 18 to 50

CHANGELOG.md

@@ -52,7 +52,8 @@
 - Updated ApiV1Controller, add ```mobile_apis``` to /api/v1/instance endpoint ([57407463](https://github.com/pixelfed/pixelfed/commit/57407463))
 - Updated PublicTimelineService, add video media scopes ([7b00eba3](https://github.com/pixelfed/pixelfed/commit/7b00eba3))
 - Updated PublicApiController, add AccountService ([5ebd2c8a](https://github.com/pixelfed/pixelfed/commit/5ebd2c8a))
-- Update CommentController, fix scope bug ([45ecad2a](https://github.com/pixelfed/pixelfed/45ecad2a))
+- Updated CommentController, fix scope bug ([45ecad2a](https://github.com/pixelfed/pixelfed/45ecad2a))
+- Updated CollectionController, increase limit from 18 to 50. ([c2826fd3](https://github.com/pixelfed/pixelfed/c2826fd3))
 
 ## Deprecated
     

app/Http/Controllers/CollectionController.php

@@ -121,8 +121,8 @@ class CollectionController extends Controller
         $collection = Collection::whereProfileId($profileId)->findOrFail($collectionId);
         $count = $collection->items()->count();
 
-        if($count >= 18) {
-            abort(400, 'You can only add 18 posts per collection');
+        if($count >= 50) {
+            abort(400, 'You can only add 50 posts per collection');
         }
 
         $status = Status::whereScope('public')

contrib/docker/Dockerfile.apache

@@ -18,8 +18,7 @@ RUN apt-get update \
       --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 \
+ && docker-php-ext-enable pcntl gd exif zip curl \
  && a2enmod rewrite remoteip \
  && {\
      echo RemoteIPHeader X-Real-IP ;\