Merge pull request #3059 from evazion/fix-artist-api

Don't return `domains` in /artists.json.

app/controllers/artists_controller.rb

@@ -55,14 +55,7 @@ class ArtistsController < ApplicationController
   def show
     @artist = Artist.find(params[:id])
     @post_set = PostSets::Artist.new(@artist)
-    respond_with(@artist) do |format|
+    respond_with(@artist, methods: [:domains], include: [:urls])
-      format.xml do
-        render :xml => @artist.to_xml(:include => [:urls])
-      end
-      format.json do
-        render :json => @artist.to_json(:include => [:urls])
-      end
-    end
   end
 
   def create

app/models/artist.rb

@@ -538,10 +538,6 @@ class Artist < ActiveRecord::Base
       super + [:other_names_index]
     end
 
-    def method_attributes
-      super + [:domains]
-    end
-
     def legacy_api_hash
       return {
         :id => id,