[ARVADOS] updated: 9318b234cbfae138524e45080f549c277e15776b

[Git user]

Summary of changes:
 apps/workbench/app/controllers/users_controller.rb    | 2 +-
 apps/workbench/app/views/users/_repositories.html.erb | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

       via  9318b234cbfae138524e45080f549c277e15776b (commit)
      from  1883b07d5de707066bf996c1526073df323c3991 (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 9318b234cbfae138524e45080f549c277e15776b
Author: radhika <radhika at curoverse.com>
Date:   Tue Jun 20 14:15:43 2017 -0400

    11060: sort order and delete prompt updated
    
    Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika at curoverse.com>

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 6f527cd..350f297 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -258,7 +258,7 @@ class UsersController < ApplicationController
 
   def repositories
     # all repositories accessible by current user
-    all_repositories = Hash[Repository.all.order(:name).collect {|repo| [repo.uuid, repo]}]
+    all_repositories = Hash[Repository.all.order('name asc').collect {|repo| [repo.uuid, repo]}]
 
     @my_repositories = [] # we want them ordered as owned and the rest
     @repo_writable = {}
diff --git a/apps/workbench/app/views/users/_repositories.html.erb b/apps/workbench/app/views/users/_repositories.html.erb
index 0ac8405..ba91b9c 100644
--- a/apps/workbench/app/views/users/_repositories.html.erb
+++ b/apps/workbench/app/views/users/_repositories.html.erb
@@ -19,10 +19,6 @@
     <p>
       In order to clone git repositories using SSH, <%= link_to ssh_keys_user_path(current_user) do%> add an SSH key to your account<%end%> and clone the git@ URLs.
     </p>
-    <p>
-      For more information see <%= link_to raw('Writing a pipeline'),
-      "#{Rails.configuration.arvados_docsite}/user/tutorials/tutorial-firstscript.html", target: "_blank"%>.
-    </p>
 
     <% if !@my_repositories.any? %>
       You do not seem to have access to any repositories. If you would like to request access, please contact your system admin.
@@ -57,7 +53,7 @@
               </td>
               <td>
                 <% if repo.editable? %>
-                    <%= link_to(repository_path(id: repo.uuid), method: :delete, class: 'btn btn-sm', data: {confirm: "Really delete repositories?"}) do %>
+                    <%= link_to(repository_path(id: repo.uuid), method: :delete, class: 'btn btn-sm', data: {confirm: "Really delete '#{repo.name || repo.uuid}'?"}) do %>
                         <i class="fa fa-fw fa-trash-o"></i>
                     <% end %>
                 <% end %>

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


hooks/post-receive
--