Merge pull request #3024 from oblakeerickson/avatar_return_json

Have pick_avatar return json.

app/controllers/users_controller.rb

@@ -500,7 +500,7 @@ class UsersController < ApplicationController
     end
     user.save!
 
-    render nothing: true
+    render json: success_json
   end
 
   def destroy_user_image

spec/controllers/users_controller_spec.rb

@@ -1292,6 +1292,13 @@ describe UsersController do
         response.should be_success
       end
 
+      it 'returns success' do
+        xhr :put, :pick_avatar, username: user.username, upload_id: 111
+        user.reload.uploaded_avatar_id.should == 111
+        response.should be_success
+        json = ::JSON.parse(response.body)
+        json['success'].should == "OK"
+      end
     end
 
   end