From c7de0ace1aef1bda31f5d58049b2f6ac471b4b9d Mon Sep 17 00:00:00 2001 From: Htin Zaw <106032566+htinz@users.noreply.github.com> Date: Thu, 16 Jun 2022 19:20:19 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=A5:=20replace=20valid=20email=20addre?= =?UTF-8?q?ss=20"moderators"=20instead=20of=20"organizers"=20(#11192)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update _spam.html.erb * 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 +- app/views/spam2/_spam.html.erb | 2 +- 4 files changed, 7 insertions(+), 7 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 @@

Moderate potential spam

-

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 moderators@<%= request.host %>. If we all work together, we can keep spam to a minimum. Thanks for helping out!

+

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 moderators@<%= request.host %>. If we all work together, we can keep spam to a minimum. Thanks for helping out!