From 03b7e11bd6125d4128cf99bc408723d1548f0613 Mon Sep 17 00:00:00 2001
From: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com>
Date: Sun, 17 May 2020 18:59:25 +0200
Subject: [PATCH 1/2] Do not show lock icon on repo list for public repos in
 private org (#11445)

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
---
 templates/explore/repo_list.tmpl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl
index 42e8d1f662d53..37bd38c5faeaa 100644
--- a/templates/explore/repo_list.tmpl
+++ b/templates/explore/repo_list.tmpl
@@ -15,10 +15,6 @@
 					<span class="middle">{{svg "octicon-repo-forked" 16}}</span>
 				{{else if .IsMirror}}
 					<span class="middle">{{svg "octicon-repo-clone" 16}}</span>
-				{{else if .Owner}}
-					{{if .Owner.Visibility.IsPrivate}}
-					<span class="text gold">{{svg "octicon-lock" 16}}</span>
-					{{end}}
 				{{end}}
 				<div class="ui right metas">
 					{{if .PrimaryLanguage }}

From 1d3b6aeda3bafc3de02aaf77bedbaa398d975f60 Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Sun, 17 May 2020 20:52:03 +0200
Subject: [PATCH 2/2] Fix .comment-code-cloud not being removed when cancelling
 new code comment

---
 templates/repo/diff/comment_form.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/diff/comment_form.tmpl b/templates/repo/diff/comment_form.tmpl
index a286725722922..e201db46875cf 100644
--- a/templates/repo/diff/comment_form.tmpl
+++ b/templates/repo/diff/comment_form.tmpl
@@ -2,7 +2,7 @@
 	{{if $.hidden}}
 		<button class="comment-form-reply ui green labeled icon tiny button"><i class="reply icon"></i> {{$.root.i18n.Tr "repo.diff.comment.reply"}}</button>
 	{{end}}
-	<form class="ui form {{if $.hidden}}hide{{end}} comment-form comment-form-reply" action="{{$.root.Issue.HTMLURL}}/files/reviews/comments" method="post">
+	<form class="ui form {{if $.hidden}}hide comment-form comment-form-reply{{end}}" action="{{$.root.Issue.HTMLURL}}/files/reviews/comments" method="post">
 	{{$.root.CsrfTokenHtml}}
 		<input type="hidden" name="latest_commit_id" value="{{$.root.AfterCommitID}}"/>
 		<input type="hidden" name="side" value="{{if $.Side}}{{$.Side}}{{end}}">