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!