diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index dc25b47beefdfda1a4a6cd75ac3e397940068187..72666bc307501bd161001dcd4cf622064e0eeb55 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -7,13 +7,6 @@ class UsersController < ApplicationController before_filter :authenticate_user!, :except => [:new, :create] respond_to :html - respond_to :json, :only => :show - - def show - @user = User.find_by_id params[:id] - @user_profile = @user.person.profile - respond_with @user - end def edit @user = current_user diff --git a/config/routes.rb b/config/routes.rb index 12dd20ba7826527aad737921c9175ce72fe69fa6..188c4b137aa0eb2cda7caf11a33e59b1d76e6708 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,7 +6,7 @@ Diaspora::Application.routes.draw do resources :people, :only => [:index, :show, :destroy] - resources :users, :except => [:create, :new] + resources :users, :except => [:create, :new, :show] resources :status_messages, :only => [:create, :destroy, :show] resources :comments, :except => [:index] resources :requests, :except => [:edit, :update]