Skip to content

Commit

Permalink
🐥: replace valid email address "moderators" instead of "organizers" (#…
Browse files Browse the repository at this point in the history
…11192)

* Update _spam.html.erb

* Update: PR#11192 & PR#11193 are put in a single PR and make a few changes in .gitigonore file
  • Loading branch information
htinz authored Jun 16, 2022
1 parent 833f7b1 commit c7de0ac
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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/*
Expand Down Expand Up @@ -52,6 +51,7 @@ solr/*
test/reports/
!config/application.yml
test.sqlite-journal

# Ignore NPM
node_modules
.byebug_history
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/spam.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/users.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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 />

Expand Down
2 changes: 1 addition & 1 deletion app/views/spam2/_spam.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down

0 comments on commit c7de0ac

Please sign in to comment.