Merge branch 'collection-curator' into 'master'

Collection curator

See merge request !422

app/controllers/v1/collections_controller.rb

@@ -99,7 +99,7 @@ class V1::CollectionsController < ApplicationController
 
   # Never trust parameters from the scary internet, only allow the white list through.
   def collection_params
-    params.require(:collection).permit(:name, :description, :owner_id, :owner_type, :privacy, tags: [])
+    params.require(:collection).permit(:name, :curator, :description, :owner_id, :owner_type, :privacy, tags: [])
   end
 
   def extra_params

app/serializers/collection_serializer.rb

@@ -28,7 +28,7 @@ class CollectionSerializer < ActiveModel::Serializer
     thumbs
   end
 
-  attributes :id, :name, :created_at, :updated_at, :description, :privacy, :score, :likes_count, :liked, :followed, :reviewed, :complained, :review_average, :thumbnail, :items_thumbnails
+  attributes :id, :name, :curator, :created_at, :updated_at, :description, :privacy, :score, :likes_count, :liked, :followed, :reviewed, :complained, :review_average, :thumbnail, :items_thumbnails
 
   belongs_to :owner
   has_many :tags

db/migrate/20170518120936_add_curator_to_collection.rb

+class AddCuratorToCollection < ActiveRecord::Migration[5.0]
+  def change
+    add_column :collections, :curator, :string
+  end
+end