[ARVADOS] updated: 6e2ba4dee569cb6b6106ab9ac8f655e6723a639e

[git at public.curoverse.com]

Summary of changes:

       via  6e2ba4dee569cb6b6106ab9ac8f655e6723a639e (commit)
       via  36195687aae63629fd1f2ce25a67c27c109303eb (commit)
      from  5bd0cf6cb695b12053d28698349624aa3b3860b6 (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 6e2ba4dee569cb6b6106ab9ac8f655e6723a639e
Merge: 3619568 5bd0cf6
Author: radhika <radhika at curoverse.com>
Date:   Tue Oct 28 09:52:44 2014 -0400

    Merge branch '4291-collection-sharing-link-refresh-issue' of git.curoverse.com:arvados into 4291-collection-sharing-link-refresh-issue


commit 36195687aae63629fd1f2ce25a67c27c109303eb
Author: radhika <radhika at curoverse.com>
Date:   Tue Oct 28 08:56:26 2014 -0400

    4291: update to address the refrsh issue as suggested in this Stack Overflow page:
    http://stackoverflow.com/questions/6560592/rails-3-ajax-update-partial-doesnt-work-without-page-refresh

diff --git a/apps/workbench/app/views/collections/sharing_popup.js.erb b/apps/workbench/app/views/collections/sharing_popup.js.erb
index d2e0d9f..d891e06 100644
--- a/apps/workbench/app/views/collections/sharing_popup.js.erb
+++ b/apps/workbench/app/views/collections/sharing_popup.js.erb
@@ -1 +1 @@
-$("#sharing-button").html("<%= escape_javascript(render partial: 'sharing_button') %>");
+$("#sharing-button").html("<%= escape_javascript(render partial: 'sharing_button').html_safe %>");

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


hooks/post-receive
--