Merge branch 'master' into speed_up_diff_stat

peff · web-flow · commit 23838e52cfbe · 2021-01-11T01:49:52.000-05:00
diff --git a/app/views/doc/_versions.html.erb b/app/views/doc/_versions.html.erb
@@ -36,6 +36,6 @@
   <footer>
     <span class="light">Check your version of git by running<br></span>
     <strong>$</strong>
-    <input type="text" class="copyable" value="git --version" />
+    <input readonly type="text" class="copyable" value="git --version" />
   </footer>
 </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -29,13 +29,6 @@
 
 <body id="<%= @section %>">
 
-  <%= render layout: "shared/banner", locals: { id: "conservancy2020", dismissable: true } do %>
-      Git is a member of Software Freedom Conservancy, which handles
-      legal and financial needs for the project.  Conservancy is
-      currently raising funds to continue their mission. Consider
-      <a href="https://sfconservancy.org/supporter/">becoming a supporter</a>!
-  <% end %>
-
   <div class="inner">
     <%= render partial: "shared/header" %>
   </div> <!-- .inner -->
