[ARVADOS] updated: f662e62c925d89ad466ff2271919dd6dd2ccfa86

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb        | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

  discards  e4db3740ca65d6b1c443707b70a73317e8b2610d (commit)
  discards  2663cf43d2120ee253c020a96fc004e765bf6dda (commit)
  discards  8e7d4e832d73164f2ba05f376161088bbf795a38 (commit)
  discards  ebd8e5cd430b502953fca618d3a632a59065e62e (commit)
       via  f662e62c925d89ad466ff2271919dd6dd2ccfa86 (commit)
       via  23aea08b10f5067a6f303941db9cc45277af8ba0 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (e4db3740ca65d6b1c443707b70a73317e8b2610d)
            \
             N -- N -- N (f662e62c925d89ad466ff2271919dd6dd2ccfa86)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 f662e62c925d89ad466ff2271919dd6dd2ccfa86
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Nov 1 15:45:04 2014 -0400

    4389: Add debugging tools to dev bundle.

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 68f609d..90532ea 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -32,6 +32,11 @@ group :assets do
   gem 'uglifier', '>= 1.0.3'
 end
 
+group :development do
+  gem 'byebug'
+  gem 'ruby-debug-passenger'
+end
+
 group :test do
   gem 'rvm-capistrano'
   gem 'selenium-webdriver'
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 1e882a9..70ef7a0 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -56,6 +56,10 @@ GEM
     bootstrap-x-editable-rails (1.5.1.1)
       railties (>= 3.0)
     builder (3.2.2)
+    byebug (3.5.1)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+      slop (~> 3.6)
     capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
@@ -78,8 +82,10 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
+    columnize (0.8.9)
     commonjs (0.2.7)
     daemon_controller (1.1.7)
+    debugger-linecache (1.2.0)
     deep_merge (1.0.1)
     erubis (2.7.0)
     execjs (2.0.2)
@@ -171,6 +177,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (10.3.1)
     ref (1.0.5)
+    ruby-debug-passenger (0.2.0)
     rubyzip (1.1.0)
     rvm-capistrano (1.5.1)
       capistrano (~> 2.15.4)
@@ -196,6 +203,7 @@ GEM
     simplecov-html (0.7.1)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
+    slop (3.6.0)
     sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -238,6 +246,7 @@ DEPENDENCIES
   bootstrap-sass (~> 3.1.0)
   bootstrap-tab-history-rails
   bootstrap-x-editable-rails
+  byebug
   capybara
   coffee-rails
   deep_merge
@@ -254,6 +263,7 @@ DEPENDENCIES
   piwik_analytics
   poltergeist
   rails (~> 4.1.0)
+  ruby-debug-passenger
   rvm-capistrano
   sass
   sass-rails

commit 23aea08b10f5067a6f303941db9cc45277af8ba0
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Nov 1 15:44:23 2014 -0400

    4389: Fix infinite loop when ownership trail terminates at a self-owning user.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 4f5d8fd..f52c24d 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -810,6 +810,12 @@ class ApplicationController < ActionController::Base
     crumbs = []
     current = @name_link || @object
     while current
+      # Halt if a group ownership loop is detected. API should refuse
+      # to produce this state, but it could still arise from a race
+      # condition when group ownership changes between our find()
+      # queries.
+      break if crumbs.collect(&:uuid).include? current.uuid
+
       if current.is_a?(Group) and current.group_class == 'project'
         crumbs.prepend current
       end

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


hooks/post-receive
--