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

diff --cc apps/workbench/app/controllers/repositories_controller.rb
Simple merge

diff --cc apps/workbench/app/controllers/users_controller.rb
Simple merge

diff --cc apps/workbench/app/views/layouts/body.html.erb
Simple merge

diff --cc apps/workbench/app/views/repositories/_add_repository_modal.html.erb
Simple merge

diff --cc apps/workbench/app/views/repositories/_show_help.html.erb
index 42ec96ff7eb90fb3eae5acced930a622be9fe67a,7980738b557d09abaf7f7f24caf553014f3bd845..5904fb29db8a513d05f0d9532cf666b650c1bb49
--- 1/apps/workbench/app/views/repositories/_show_help.html.erb
--- 2/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 @@@
 -<% if (example = @objects.select(&:push_url).first) %>
+ <%# Copyright (C) The Arvados Authors. All rights reserved.
+ 
+ SPDX-License-Identifier: AGPL-3.0 %>
+ 
 +<%
 +    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:

diff --cc apps/workbench/test/controllers/repositories_controller_test.rb
Simple merge

diff --cc apps/workbench/test/controllers/users_controller_test.rb
Simple merge

diff --cc apps/workbench/test/integration/application_layout_test.rb
Simple merge

diff --cc apps/workbench/test/integration/user_settings_menu_test.rb
Simple merge