[ARVADOS] updated: 4b3e5e50e262fc51a158c1aed1942b1ef176e2eb

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/actions_controller.rb          | 23 ++++++---
 .../views/application/_title_and_buttons.html.erb  | 21 ++++++--
 .../app/views/collections/_show_files.html.erb     |  4 +-
 .../app/views/projects/_show_tab_contents.html.erb |  2 +-
 .../workbench/test/integration/collections_test.rb | 60 ++++++++++++++--------
 apps/workbench/test/integration/projects_test.rb   | 54 +++++++++++--------
 6 files changed, 110 insertions(+), 54 deletions(-)

       via  4b3e5e50e262fc51a158c1aed1942b1ef176e2eb (commit)
       via  136f77bed67bd349fb73053379dcb7bae6a16592 (commit)
       via  55f0cfccfee8d366514a474d77cfff9befe44715 (commit)
       via  0a78f5a0efe0c88fddcd2ee91065f2a8da79055a (commit)
       via  8af19c273f0d9b6a2711bd8a17b53d4b2f61c6c2 (commit)
       via  37a349fc026e4559072e5b53c8855be42bf91dcd (commit)
       via  b1d1c5acf6f237d5e2a02414dd59e92cdb862237 (commit)
       via  fe8657ef0f8698837e9bdb5e9c1bf26a068efba9 (commit)
       via  982b439de0d2113c1e131e53bc6b8151901d77f9 (commit)
       via  a9a3fe7f94ebf14a5e70a642a596010572544424 (commit)
       via  b7ab1e8793ea06c5b778ce2249b29f4ab1607c58 (commit)
       via  f35e15efbfe9466d8e08b939e5407e36454a0bc8 (commit)
      from  350f4d5a3ef163b37de2b83bd6fefd37f1a35b8b (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 4b3e5e50e262fc51a158c1aed1942b1ef176e2eb
Merge: 350f4d5 136f77b
Author: radhika <radhika at curoverse.com>
Date:   Mon Oct 6 10:18:12 2014 -0400

    Merge branch 'master' into 4025-move-project-button-label
    
    Conflicts:
    	apps/workbench/app/views/application/_title_and_buttons.html.erb

diff --cc apps/workbench/app/views/application/_title_and_buttons.html.erb
index c2bd726,713c04e..822c904
--- a/apps/workbench/app/views/application/_title_and_buttons.html.erb
+++ b/apps/workbench/app/views/application/_title_and_buttons.html.erb
@@@ -26,7 -25,7 +26,8 @@@
               selection_param: 'uuid',
               success: 'redirect-to-created-object'
             }.to_json),
-           { class: "btn btn-sm btn-primary", remote: true, method: 'get', title: "Copy this #{object_class} to a different project" }) do %>
 -          { class: "btn btn-sm btn-primary", remote: true, method: 'get' }) do %>
++          { class: "btn btn-sm btn-primary", remote: true, method: 'get',
++            title: "Make a copy this #{object_class}" }) do %>
          <i class="fa fa-fw fa-copy"></i> Copy to project...
        <% end %>
      <% end %>
@@@ -43,8 -42,8 +44,9 @@@
               selection_param: 'uuid',
               success: 'redirect-to-created-object'
             }.to_json),
-           { class: "btn btn-sm btn-primary", remote: true, method: 'get', title: "Move this #{object_class} to a different project"}) do %>
-         <i class="fa fa-fw fa-truck"></i> Move...
 -          { class: "btn btn-sm btn-primary", remote: true, method: 'get' }) do %>
 -        <i class="fa fa-fw fa-truck"></i> Move to project...
++          { class: "btn btn-sm btn-primary", remote: true, method: 'get',
++            title: "Move this #{object_class} to a different project"}) do %>
++        <i class="fa fa-fw fa-truck"></i> Move <%=object_class%>...
        <% end %>
      <% end %>
    <% end %>

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


hooks/post-receive
--