Merge branch 'master' into fix_search

app/serializers/collection_serializer.rb

@@ -13,7 +13,8 @@ class CollectionSerializer < ActiveModel::Serializer
     object.complained? current_user
   end
 
-  attributes :id, :name, :owner, :created_at, :updated_at, :description, :privacy, :score, :likes_count, :liked, :reviewed, :complained, :review_average, :thumbnail
+  attributes :id, :name, :created_at, :updated_at, :description, :privacy, :score, :likes_count, :liked, :reviewed, :complained, :review_average, :thumbnail
+  belongs_to :owner
   has_many :tags
   has_many :subjects
   has_many :educational_stages

db/migrate/20170109133754_add_nickname_to_user.rb

+class AddNicknameToUser < ActiveRecord::Migration[5.0]
+  def change
+    add_column :users, :nickname, :string
+  end
+end

lib/tasks/attachment_maintaining_service.rake

+require 'fileutils'
+
+  namespace :attachment_maintaining_service do
+    desc 'Removing 10 attachments'
+    task remove_attachments: :environment do
+      m = sort_directories.first(10)
+      m.each do |mm|
+        #puts (mm)
+        FileUtils.rm_r(mm)
+      end
+    end
+
+    def sort_directories
+      files_sorted_by_time = Dir[dir_path].sort_by{ |f| File.atime(f) }
+      files_sorted_by_time
+    end
+
+    private
+
+    def dir_path
+      c = Rails.root.join('public','attachments','*').to_s
+      c
+    end
+
+  end