[ARVADOS] updated: 65c7f47f25003775f0a9d1560829b47af70490a0

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/application_controller.rb | 12 ------------
 1 file changed, 12 deletions(-)

       via  65c7f47f25003775f0a9d1560829b47af70490a0 (commit)
      from  5b6180084964461d6201aacdb327fe4b1b2bc8b5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 65c7f47f25003775f0a9d1560829b47af70490a0
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Aug 9 16:12:17 2014 -0400

    3296: Remove session cache of user record to prevent synchronization problems.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 0593ee3..715f3cb 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -394,9 +394,6 @@ class ApplicationController < ActionController::Base
     Thread.current[:arvados_api_token] = new_token
     if new_token.nil?
       Thread.current[:user] = nil
-    elsif (new_token == session[:arvados_api_token]) and
-        session[:user].andand[:is_active]
-      Thread.current[:user] = User.new(session[:user])
     else
       Thread.current[:user] = User.current
     end
@@ -414,15 +411,6 @@ class ApplicationController < ActionController::Base
       false  # We may redirect to login, or not, based on the current action.
     else
       session[:arvados_api_token] = params[:api_token]
-      session[:user] = {
-        uuid: user.uuid,
-        email: user.email,
-        first_name: user.first_name,
-        last_name: user.last_name,
-        is_active: user.is_active,
-        is_admin: user.is_admin,
-        prefs: user.prefs
-      }
 
       if !request.format.json? and request.method.in? ['GET', 'HEAD']
         # Repeat this request with api_token in the (new) session

-----------------------------------------------------------------------


hooks/post-receive
--