Merge branch 'master' of bitbucket.org:jamkazam/jam-web

app/controllers/sessions_controller.rb

@@ -70,9 +70,6 @@ class SessionsController < ApplicationController
     if !params[:sso].nil? && params[:sso] == "desk"
       # generate multipass token and sign it
       multipass = DeskMultipass.new(user)
-      puts "multipass.token = #{multipass.token}"
-      puts "multipass.signature = #{multipass.signature}"
-
       callback_url = SampleApp::Application.config.multipass_callback_url
       redirect_to "#{callback_url}?multipass=#{multipass.token}&signature=#{multipass.signature}"
     else

app/views/clients/_profile.html.erb

@@ -43,7 +43,7 @@
             </div>
         </div>
         <br clear="all" />
-        <div id="content-scroller">
+        <div class="content-scroller" style="height:350px;">
             <div id="profile-about" class="profile-wrapper">
                 <!-- stats & location -->
                 <div class="profile-about-left">

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

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]