[ARVADOS] updated: bd7dc68d12f1d134106fd21afe9cbf2d0512c831

[Git user]

Summary of changes:
 apps/workbench/app/controllers/application_controller.rb | 2 +-
 apps/workbench/config/application.default.yml            | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

       via  bd7dc68d12f1d134106fd21afe9cbf2d0512c831 (commit)
      from  ffe1fe1c77743147ee82aacdc50edde3672cd748 (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 bd7dc68d12f1d134106fd21afe9cbf2d0512c831
Author: radhika <radhika at curoverse.com>
Date:   Mon Oct 3 17:07:43 2016 -0400

    10078: add configuration parameter to suppress display of user notifications to improve dashboard performance

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 3886d1c..c6148ca 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -769,7 +769,7 @@ class ApplicationController < ActionController::Base
 
   helper_method :user_notifications
   def user_notifications
-    return [] if @errors or not current_user.andand.is_active
+    return [] if @errors or not current_user.andand.is_active or not Rails.configuration.show_user_notifications_in_dashboard
     @notifications ||= @@notification_tests.map do |t|
       t.call(self, current_user)
     end.compact
diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 6326285..95b1784 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -282,6 +282,7 @@ common:
   running_job_log_records_to_fetch: 2000
 
   # In systems with many shared projects, dashboard loading can be
-  # slow due to collections indexing; the recent collections panel
-  # can be hidden by setting this configuration parameter to false
+  # slow due to collections indexing; use the following parameters
+  # to suppress certain properties from dashboard
   show_recent_collections_in_dashboard: true
+  show_user_notifications_in_dashboard: true

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


hooks/post-receive
--