[ARVADOS] updated: c8bea0c6dd47a9b9a7a892602d9869177d4c231f

[git at public.curoverse.com]

Summary of changes:
 .../app/views/application/_delete_object_button.html.erb       |  2 +-
 apps/workbench/test/controllers/application_controller_test.rb |  4 ++--
 doc/install/install-api-server.html.textile.liquid             |  6 +++---
 doc/install/install-arv-git-httpd.html.textile.liquid          |  2 +-
 doc/install/install-crunch-dispatch.html.textile.liquid        |  3 +--
 doc/install/install-keepproxy.html.textile.liquid              |  2 +-
 doc/install/install-manual-prerequisites.html.textile.liquid   | 10 +++++++++-
 doc/sdk/perl/index.html.textile.liquid                         |  2 +-
 services/api/script/crunch-dispatch.rb                         |  1 +
 9 files changed, 20 insertions(+), 12 deletions(-)

       via  c8bea0c6dd47a9b9a7a892602d9869177d4c231f (commit)
       via  93e0931ea059355ffc26add1303a52f13d2964c9 (commit)
       via  db717120a687b2851e526117a135a45be75cba1a (commit)
       via  b7c99efa73a3b0ccfec85915f04545d634b235b0 (commit)
       via  5f642789f87c1f0cefbb878cbb031c9b71fc7a09 (commit)
       via  54ad79868ed16e4a53f943ec9dc104c28dee2343 (commit)
       via  092e1b42918850f7166cb4e3bbda25b67049105f (commit)
       via  5916ac79faa2384d75cc41ab4af3ff1a881e8d6e (commit)
       via  29a54ec4795c707b19858e3e02dcc48bf3d77e75 (commit)
      from  467b636f7d1b34f7695f55af972ae90132fc8063 (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 c8bea0c6dd47a9b9a7a892602d9869177d4c231f
Author: radhika <radhika at curoverse.com>
Date:   Thu Aug 6 15:31:52 2015 -0400

    6880: improved deletable? check

diff --git a/apps/workbench/app/views/application/_delete_object_button.html.erb b/apps/workbench/app/views/application/_delete_object_button.html.erb
index 086484c..6ece860 100644
--- a/apps/workbench/app/views/application/_delete_object_button.html.erb
+++ b/apps/workbench/app/views/application/_delete_object_button.html.erb
@@ -1,4 +1,4 @@
-<% if object.editable? and object.deletable? %>
+<% if object.deletable? %>
   <%= link_to({action: 'destroy', id: object.uuid}, method: :delete, remote: true, data: {confirm: "Really delete #{object.class_for_display.downcase} '#{object.friendly_link_name}'?"}) do %>
     <i class="glyphicon glyphicon-trash"></i>
   <% end %>
diff --git a/apps/workbench/test/controllers/application_controller_test.rb b/apps/workbench/test/controllers/application_controller_test.rb
index 6daa63f..15d52da 100644
--- a/apps/workbench/test/controllers/application_controller_test.rb
+++ b/apps/workbench/test/controllers/application_controller_test.rb
@@ -422,7 +422,7 @@ class ApplicationControllerTest < ActionController::TestCase
   [
     [VirtualMachinesController.new, 'hostname', false],
     [UsersController.new, 'first_name', true],
-  ].each do |controller, expect_str, expect_home_link=false|
+  ].each do |controller, expect_str, expect_home_link|
     test "access #{controller.controller_name} index as admin and verify Home link is#{' not' if !expect_home_link} shown" do
       @controller = controller
 
@@ -444,7 +444,7 @@ class ApplicationControllerTest < ActionController::TestCase
   [
     [VirtualMachinesController.new, 'hostname', true],
     [UsersController.new, 'first_name', false],
-  ].each do |controller, expect_str, expect_delete_link=false|
+  ].each do |controller, expect_str, expect_delete_link|
     test "access #{controller.controller_name} index as admin and verify Delete option is#{' not' if !expect_delete_link} shown" do
       @controller = controller
 

commit 93e0931ea059355ffc26add1303a52f13d2964c9
Merge: 467b636 db71712
Author: radhika <radhika at curoverse.com>
Date:   Thu Aug 6 15:21:45 2015 -0400

    Merge branch 'master' into 6880-remove-user-delete-button


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


hooks/post-receive
--