From 2fadb1d86a61fddf78134cf123cbbea7dba55584 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Mon, 8 Jul 2013 00:12:42 -0400 Subject: [PATCH] random cleanup --- app/controllers/users_controller.rb | 2 +- config/application.rb | 4 ++-- config/routes.rb | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 4252c3ac5..dcdaf2d0c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -8,7 +8,7 @@ class UsersController < ApplicationController before_filter :correct_user, only: [:edit, :update] before_filter :admin_user, only: :destroy - rescue_from 'JamRuby::PermissionError' do |exception| + rescue_from 'PermissionError' do |exception| @exception = exception render :file => 'public/403.html', :status => 403, :layout => false end diff --git a/config/application.rb b/config/application.rb index 94ace2252..9c3b60ab7 100644 --- a/config/application.rb +++ b/config/application.rb @@ -119,10 +119,10 @@ if defined?(Bundler) if Rails.env == 'production' config.desk_url = 'https://jamkazam.desk.com' - config.multipass_callback_url = "https://jamkazam.desk.com/customer/authentication/multipass/callback" + config.multipass_callback_url = "http://jamkazam.desk.com/customer/authentication/multipass/callback" else config.desk_url = 'https://jamkazam.desk.com' # TODO: replace with test URL - config.multipass_callback_url = "https://jamkazam.desk.com/customer/authentication/multipass/callback" + config.multipass_callback_url = "http://jamkazam.desk.com/customer/authentication/multipass/callback" end # perf_data configs diff --git a/config/routes.rb b/config/routes.rb index 35442cba8..a5b0e1bc4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,8 +6,6 @@ SampleApp::Application.routes.draw do end resources :users - resources :music_sessions - resources :friend_requests resources :sessions, only: [:new, :create, :destroy]