Merge branch 'bookmarks-routes' into 'master'

Bookmarks routes

See merge request !381

app/controllers/v1/users/bookmarks_controller.rb

@@ -33,7 +33,7 @@ class V1::Users::BookmarksController < ApplicationController
   end
 
   def set_user
-    @user = User.find(params[:id])
+    @user = User.find(params[:user_id])
   end
 
   def find_object

config/routes.rb

@@ -91,8 +91,8 @@ Rails.application.routes.draw do
     resources :feed, only: [:index]
 
     resources :users, concerns: [:followable, :deletable, :publisher] do
+    resources :bookmarks, module: 'users', only: [:index, :create, :destroy]
       member do
-        resources :bookmarks, module: 'users', only: [:index, :create, :destroy]
         get 'following/:object_type', to: 'users#following'
         get 'followers', to: 'users#followers'
         get 'activities', to: 'activities#user_activities'