From 49e4ad09d446f66996af257ef947e4386443ed05 Mon Sep 17 00:00:00 2001
From: Htin Zaw <106032566+htinz@users.noreply.github.com>
Date: Tue, 14 Jun 2022 20:14:05 +0100
Subject: [PATCH 1/2] Update _spam.html.erb

---
 app/views/spam2/_spam.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/spam2/_spam.html.erb b/app/views/spam2/_spam.html.erb
index 5232bba0aa..609fd9d098 100644
--- a/app/views/spam2/_spam.html.erb
+++ b/app/views/spam2/_spam.html.erb
@@ -62,7 +62,7 @@
 </div>
 
 <div class="collapse" id="info-div">
-  <p class="text-secondary font-italic"><i class="fa fa-certificate text-info" aria-hidden="true"></i> Moderators and admins have the ability to "spam" posts if they include inappropriate content, blatant advertising, or are otherwise problematic. If you're not sure, email at <a href="mailto:organizers@<%= request.host %>" class="badge badge-info badge-pill text-white">moderators@<%= request.host %></a>. If we all work together, we can keep spam to a minimum. Thanks for helping out!</p>
+  <p class="text-secondary font-italic"><i class="fa fa-certificate text-info" aria-hidden="true"></i> Moderators and admins have the ability to "spam" posts if they include inappropriate content, blatant advertising, or are otherwise problematic. If you're not sure, email at <a href="mailto:moderators@<%= request.host %>" class="badge badge-info badge-pill text-white">moderators@<%= request.host %></a>. If we all work together, we can keep spam to a minimum. Thanks for helping out!</p>
 </div>
 
 <nav class="navbar navbar-expand " id="bulk-nav">

From 0df8725424d8b36594a95d6245610412231505e4 Mon Sep 17 00:00:00 2001
From: Htin Z <htindev@gmail.com>
Date: Thu, 16 Jun 2022 16:44:56 +0100
Subject: [PATCH 2/2] Update: PR#11192 & PR#11193 are put in a single PR and
 make a few changes in .gitigonore file

---
 .gitignore                     | 8 ++++----
 app/views/admin/spam.html.erb  | 2 +-
 app/views/admin/users.html.erb | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7eb1f59e4f..18696ec0a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,12 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-#
+# See http://help.github.com/ignore-files/ for more about ignoring files
 # If you find yourself ignoring temporary files generated by your text editor
 # or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile ~/.gitignore_global
+# git config --global core.excludesfile ~/.gitignore_global
 
 # Ignore bundler config
 .bundle
 
-# Ignore all logfiles and tempfiles.
+# Ignore all logfiles and tempfiles
 log/*.log
 log/*
 /tmp/*
@@ -52,6 +51,7 @@ solr/*
 test/reports/
 !config/application.yml
 test.sqlite-journal
+
 # Ignore NPM
 node_modules
 .byebug_history
diff --git a/app/views/admin/spam.html.erb b/app/views/admin/spam.html.erb
index 717a94c25a..c70a6f8e57 100644
--- a/app/views/admin/spam.html.erb
+++ b/app/views/admin/spam.html.erb
@@ -2,7 +2,7 @@
 
   <h3>Moderate potential spam</h3>
 
-  <p>Moderators and admins have the ability to "spam" posts if they include inappropriate content, blatant advertising, or are otherwise problematic. If you're not sure, email <a href="mailto:organizers@<%= request.host %>">moderators@<%= request.host %></a>. If we all work together, we can keep spam to a minimum. Thanks for helping out!</p>
+  <p>Moderators and admins have the ability to "spam" posts if they include inappropriate content, blatant advertising, or are otherwise problematic. If you're not sure, email <a href="mailto:moderators@<%= request.host %>">moderators@<%= request.host %></a>. If we all work together, we can keep spam to a minimum. Thanks for helping out!</p>
 
   <ul class="nav nav-tabs">
     <li class="nav-item"><a class="nav-link <% unless params[:type] && params[:action] == "spam_revisions" %> active <% end %>" href="/spam">Filtered</a></li>
diff --git a/app/views/admin/users.html.erb b/app/views/admin/users.html.erb
index b83906692c..c0a6e6599c 100644
--- a/app/views/admin/users.html.erb
+++ b/app/views/admin/users.html.erb
@@ -2,7 +2,7 @@
 
   <h3>User moderation:</h3> 
 
-  <p>Moderators and admins have the ability to ban users if they post inappropriate content, blatant advertising, or are otherwise problematic. If you're not sure, email <a href="mailto:organizers@<%= request.host %>">organizers@<%= request.host %></a>. If we all work together, we can keep spam to a minimum. Thanks for helping out!</p>
+  <p>Moderators and admins have the ability to ban users if they post inappropriate content, blatant advertising, or are otherwise problematic. If you're not sure, email <a href="mailto:moderators@<%= request.host %>">moderators@<%= request.host %></a>. If we all work together, we can keep spam to a minimum. Thanks for helping out!</p>
 
   <hr />