Merge branch 'fix-controllers'

app/controllers/concerns/sociable_controller.rb

@@ -38,4 +38,4 @@ module SociableController
     sociable.view current_user if user_signed_in?
   end
 
-end
\ No newline at end of file
+end

app/controllers/v1/collections_controller.rb

@@ -68,6 +68,6 @@ 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, :tag, learning_objects: [])
+    params.require(:collection).permit(:name, :description, :owner_id, :owner_type, :privacy, :tag, learning_objects: [])
   end
 end

config/routes.rb

@@ -39,7 +39,9 @@ Rails.application.routes.draw do
   namespace :v1 do
     resources :users, concerns: :followable do
       member do
-        resources :bookmarks, module: 'users', only: [:index, :create, :destroy]
+        resources :bookmarks, module: 'users', only: [:index, :create]
+
+        delete :bookmarks, to: 'bookmarks#destroy'
       end
     end
     resources :collections, concerns: [:followable, :sociable, :reviewable, :taggable]