[ARVADOS] updated: d1c1d50d671e87f5fa5ad24904e7c18123835db9

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb      |  4 +-
 .../app/views/issue_reporter/send_report.text.erb  |  4 +
 .../test/integration/application_layout_test.rb    |  6 +-
 crunch_scripts/arvados-bcbio-nextgen.py            |  2 +-
 crunch_scripts/collection-merge                    |  2 +-
 .../crunchutil}/__init__.py                        |  0
 crunch_scripts/crunchutil/robust_put.py            | 48 +++++++++++
 crunch_scripts/{ => crunchutil}/subst.py           |  2 +-
 crunch_scripts/crunchutil/vwd.py                   | 54 +++++++++++++
 crunch_scripts/decompress-all.py                   | 11 ++-
 crunch_scripts/run-command                         | 93 +++++++++++-----------
 crunch_scripts/split-fastq.py                      |  6 +-
 12 files changed, 169 insertions(+), 63 deletions(-)
 copy {services/fuse/tests => crunch_scripts/crunchutil}/__init__.py (100%)
 create mode 100644 crunch_scripts/crunchutil/robust_put.py
 rename crunch_scripts/{ => crunchutil}/subst.py (98%)
 create mode 100644 crunch_scripts/crunchutil/vwd.py

       via  d1c1d50d671e87f5fa5ad24904e7c18123835db9 (commit)
       via  82386abaf8f818a64cd730b9af0e0cfa97a6d0ae (commit)
       via  943eba40119252ed4fe57bf7d83a7c628bfcb2ba (commit)
       via  5f62b0c02ef381f4617a4201197e34998638308e (commit)
       via  412c3d66297962c8b2b0385ec0fa14d470dfdb03 (commit)
       via  54e4827b3e5918b5df439f7c273eedb3c00e372f (commit)
       via  eb6992db915a1fea2a8f9acfccf26d2d091e66e0 (commit)
       via  02d6330526fbd94f4a1d711ee6ffc18a1553febf (commit)
       via  43880152b12f257e7b1df225d355e7207a49dcc8 (commit)
       via  a437c40e832b7e2038d6c3de8771328ca84491c9 (commit)
      from  d322fffbaa6eccc23c86f3271641845072f127e8 (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 d1c1d50d671e87f5fa5ad24904e7c18123835db9
Merge: 82386ab 943eba4
Author: radhika <radhika at curoverse.com>
Date:   Thu Aug 14 14:44:17 2014 -0400

    Merge branch 'master' into 3112-report-bug


commit 82386abaf8f818a64cd730b9af0e0cfa97a6d0ae
Author: radhika <radhika at curoverse.com>
Date:   Thu Aug 14 14:43:24 2014 -0400

    3112: report issue works for no user and inactive user cases.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 2228880..e018363 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -11,9 +11,9 @@ class ApplicationController < ActionController::Base
   around_filter :set_thread_api_token
   # Methods that don't require login should
   #   skip_around_filter :require_thread_api_token
-  around_filter :require_thread_api_token, except: ERROR_ACTIONS
+  around_filter :require_thread_api_token, except: [:report_issue_popup, :report_issue] + ERROR_ACTIONS
   before_filter :accept_uuid_as_id_param, except: ERROR_ACTIONS
-  before_filter :check_user_agreements, except: ERROR_ACTIONS
+  before_filter :check_user_agreements, except: [:report_issue_popup, :report_issue] + ERROR_ACTIONS
   before_filter :check_user_profile, except: [:update_profile] + ERROR_ACTIONS
   before_filter :check_user_notifications, except: ERROR_ACTIONS
   before_filter :load_filters_and_paging_params, except: ERROR_ACTIONS
diff --git a/apps/workbench/app/views/issue_reporter/send_report.text.erb b/apps/workbench/app/views/issue_reporter/send_report.text.erb
index 9afd1d2..466d091 100644
--- a/apps/workbench/app/views/issue_reporter/send_report.text.erb
+++ b/apps/workbench/app/views/issue_reporter/send_report.text.erb
@@ -1,4 +1,8 @@
+<% if @user %>
 Issue reported by user <%=@user.full_name%> <%=@user.email%>
+<% else %>
+Issue reported
+<% end %>
 
 Details of the report:
 <% json_map = JSON.parse(@params['report_additional_info']).map %>
diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index 9b1085a..5fe86cc 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -64,7 +64,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
   end
 
   # test the help menu
-  def check_help_menu user
+  def check_help_menu
     within('.navbar-fixed-top') do
       page.find("#arv-help").click
       within('.dropdown-menu') do
@@ -79,7 +79,6 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       end
     end
 
-    if user && user['is_active']  # TBD - no user as well as inactive user also should be able to report issue
     within '.modal-content' do
       assert page.has_text? 'Version / debugging info'
       assert page.has_no_text? 'Report a problem'
@@ -119,7 +118,6 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       page.find_field('report_text').set 'my test report text'
       click_button 'Report issue'
     end
-    end   # TBD - when no user and inactive user work, this should go away
 
     assert page.has_no_text? 'Version / debugging info'
   end
@@ -356,7 +354,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
         visit page_with_token(token)
       end
 
-      check_help_menu user
+      check_help_menu
     end
 
   end

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


hooks/post-receive
--