From: radhika <radhika@curoverse.com>
Date: Fri, 30 Jun 2017 17:25:31 +0000 (-0400)
Subject: Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika@curoverse.com>
X-Git-Tag: 1.1.0~162^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/0561bd0c3c07257fd58ded6c7cfa5feeae97af57

Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika@curoverse.com>

Merge branch 'master' into 11870-repositories-index

Conflicts:
	apps/workbench/app/views/repositories/_show_help.html.erb
	apps/workbench/app/views/users/_repositories.html.erb
	apps/workbench/app/views/users/repositories.html.erb
---

0561bd0c3c07257fd58ded6c7cfa5feeae97af57
diff --cc apps/workbench/app/views/repositories/_show_help.html.erb
index 42ec96ff7e,7980738b55..5904fb29db
--- a/apps/workbench/app/views/repositories/_show_help.html.erb
+++ b/apps/workbench/app/views/repositories/_show_help.html.erb
@@@ -1,10 -1,8 +1,14 @@@
+ <%# Copyright (C) The Arvados Authors. All rights reserved.
+ 
+ SPDX-License-Identifier: AGPL-3.0 %>
+ 
 -<% if (example = @objects.select(&:push_url).first) %>
 +<%
 +    filters = @filters + [["owner_uuid", "=", current_user.uuid]]
 +    example = Repository.all.order("name ASC").filter(filters).limit(1).results.first
 +    example = Repository.all.order("name ASC").limit(1).results.first if !example
 +%>
 +
 +<% if example %>
  
  <p>
  Sample git quick start: