[ARVADOS] created: 8e7d4e832d73164f2ba05f376161088bbf795a38
git at public.curoverse.com
git at public.curoverse.com
Sat Nov 1 15:45:16 EDT 2014
at 8e7d4e832d73164f2ba05f376161088bbf795a38 (commit)
commit 8e7d4e832d73164f2ba05f376161088bbf795a38
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 ebd8e5cd430b502953fca618d3a632a59065e62e
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. Remove obsolete name_link support.
diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 4f5d8fd..46eaaaf 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -808,16 +808,10 @@ class ApplicationController < ActionController::Base
helper_method :project_breadcrumbs
def project_breadcrumbs
crumbs = []
- current = @name_link || @object
- while current
- if current.is_a?(Group) and current.group_class == 'project'
- crumbs.prepend current
- end
- if current.is_a? Link
- current = Group.find?(current.tail_uuid)
- else
- current = Group.find?(current.owner_uuid)
- end
+ current = @object
+ while current.is_a?(Group) and current.group_class == 'project'
+ crumbs.prepend current
+ current = Group.find?(current.owner_uuid)
end
crumbs
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list