diff --git a/apps/social/views.py b/apps/social/views.py
index 688acc91f..7181b6587 100644
--- a/apps/social/views.py
+++ b/apps/social/views.py
@@ -1175,7 +1175,7 @@ def ignore_follower(request):
     return {'code': code}
 
 
-@required_params('query')
+@required_params('query', method="GET")
 @json.json_view
 def find_friends(request):
     query = request.GET['query']
diff --git a/utils/view_functions.py b/utils/view_functions.py
index b45905ec3..71366e88e 100644
--- a/utils/view_functions.py
+++ b/utils/view_functions.py
@@ -94,4 +94,8 @@ class required_params(object):
         return HttpResponse(json.encode({
             'message': message,
             'code': -1,
-        }), content_type="application/json", status=status_code)
\ No newline at end of file
+<<<<<<< Updated upstream
+        }), content_type="application/json", status=status_code)
+=======
+        }), mimetype="application/json", status=status_code)
+>>>>>>> Stashed changes