Move contacts search to contacts#index

1 files changed, 4 insertions, 9 deletions

diff --git a/app/controllers/contacts_controller.rb b/app/controllers/contacts_controller.rb
index 8e9b670f6..d3734da9b 100644
--- a/app/controllers/contacts_controller.rb
+++ b/app/controllers/contacts_controller.rb
@@ -13,17 +13,12 @@ class ContactsController < ApplicationController
 
       # Used by the mobile site
       format.mobile { set_up_contacts_mobile }
-    end
-  end
-
-  def search
-    @people = Person.search(params[:q], current_user, only_contacts: true).limit(15)
 
-    respond_to do |format|
-      format.json do
-        @people = @people.limit(15)
+      # Used for mentions in the publisher
+      format.json {
+        @people = Person.search(params[:q], current_user, only_contacts: true).limit(15)
         render json: @people
-      end
+      }
     end
   end