diff --git a/web/app/controllers/api_users_controller.rb b/web/app/controllers/api_users_controller.rb index 3ee708c40..9fbdcf577 100644 --- a/web/app/controllers/api_users_controller.rb +++ b/web/app/controllers/api_users_controller.rb @@ -15,13 +15,13 @@ class ApiUsersController < ApiController def index # don't return users that aren't yet confirmed - @users = User.where('email_confirmed=TRUE').paginate(page: params[:page]) + @users = User.paginate(page: params[:page]) respond_with @users, responder: ApiResponder, :status => 200 end def show # don't return users that aren't yet confirmed - @user = User.where('email_confirmed=TRUE').find(params[:id]) + @user = User.find(params[:id]) respond_with @user, responder: ApiResponder, :status => 200 end diff --git a/websocket-gateway/lib/jam_websockets/server.rb b/websocket-gateway/lib/jam_websockets/server.rb index d12cf5f37..4b2b299f2 100644 --- a/websocket-gateway/lib/jam_websockets/server.rb +++ b/websocket-gateway/lib/jam_websockets/server.rb @@ -20,6 +20,7 @@ module JamWebsockets @log.info "starting server #{host}:#{port} with staleness_time=#{connect_time_stale}; reconnect time = #{connect_time_expire}" EventMachine.error_handler{|e| + @log.error "unhandled error #{e}" Bugsnag.notify(e) }