[ARVADOS] updated: 536713e6a7c16e7a54eef1c310f15c708cb1f2be

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/actions_controller.rb        | 3 +++
 apps/workbench/app/controllers/application_controller.rb    | 4 ++--
 apps/workbench/app/views/application/_report_error.html.erb | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

       via  536713e6a7c16e7a54eef1c310f15c708cb1f2be (commit)
      from  b56386aab9f0cddde9727d4e76fb28aae8b442c7 (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 536713e6a7c16e7a54eef1c310f15c708cb1f2be
Author: radhika <radhika at curoverse.com>
Date:   Tue Aug 26 11:40:36 2014 -0400

    3112: skip filters in actions controller, instead of application controller

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index c815ba9..fcca2ab 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -1,5 +1,8 @@
 class ActionsController < ApplicationController
 
+  skip_filter :require_thread_api_token, only: [:report_issue_popup, :report_issue]
+  skip_filter :check_user_agreements, only: [:report_issue_popup, :report_issue]
+
   @@exposed_actions = {}
   def self.expose_action method, &block
     @@exposed_actions[method] = true
diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 0567f73..b211f51 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: [:report_issue_popup, :report_issue] + ERROR_ACTIONS
+  around_filter :require_thread_api_token, except: ERROR_ACTIONS
   before_filter :accept_uuid_as_id_param, except: ERROR_ACTIONS
-  before_filter :check_user_agreements, except: [:report_issue_popup, :report_issue] + ERROR_ACTIONS
+  before_filter :check_user_agreements, except: ERROR_ACTIONS
   before_filter :check_user_profile, except: 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/application/_report_error.html.erb b/apps/workbench/app/views/application/_report_error.html.erb
index 8ab1d89..2e449b7 100644
--- a/apps/workbench/app/views/application/_report_error.html.erb
+++ b/apps/workbench/app/views/application/_report_error.html.erb
@@ -1,5 +1,5 @@
 <p>
-<br/><strong>If you suspect this is a bug, you can help us fix it by sending us a problem report:</strong></br></br>
+<br/><strong>If you suspect this is a bug, you can help us fix it by sending us a problem report:</strong><br/><br/>
 <% if error_type == 'api' %>
   <%
     api_request_url = api_error.andand.request_url ? api_error.request_url : ''
@@ -16,6 +16,6 @@
   <% end %>
 <% end %>
 <% support_email = Rails.configuration.support_email_address%>
-<br/></br>
+<br/><br/>
   If you prefer, send email to: <a href="mailto:<%=support_email%>?subject=Workbench problem report&body=Problem while viewing page <%=request.url%>"><%=support_email%></a>
 </p>

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


hooks/post-receive
--