Add rubocop to our build. (#5004)

This commit is contained in:
Guo Xiang Tan
2017-07-28 10:20:09 +09:00
committed by GitHub
parent ff4e295c4f
commit 5012d46cbd
871 changed files with 5480 additions and 6056 deletions

View File

@ -3,11 +3,11 @@
require 'action_mailer'
# Make this your email address. Poor example.com gets SO MUCH MAIL
YOUR_EMAIL = "nobody@example.com"
YOUR_EMAIL = "nobody@example.com"
# Change these to be the same settings as your Discourse environment
DISCOURSE_SMTP_ADDRESS = "smtp.example.com" # (mandatory)
@DISCOURSE_SMTP_PORT = 587 # (optional)
DISCOURSE_SMTP_ADDRESS = "smtp.example.com" # (mandatory)
@DISCOURSE_SMTP_PORT = 587 # (optional)
@DISCOURSE_SMTP_USER_NAME = "username" # (optional)
@DISCOURSE_SMTP_PASSWORD = "blah" # (optional)
#@DISCOURSE_SMTP_OPENSSL_VERIFY_MODE = "none" # (optional) none|peer|client_once|fail_if_no_peer_cert
@ -22,7 +22,7 @@ $delivery_options = {
user_name: @DISCOURSE_SMTP_USER_NAME || nil,
password: @DISCOURSE_SMTP_PASSWORD || nil,
address: DISCOURSE_SMTP_ADDRESS,
port: @DISCOURSE_SMTP_PORT || nil,
port: @DISCOURSE_SMTP_PORT || nil,
openssl_verify_mode: @DISCOURSE_SMTP_OPENSSL_VERIFY_MODE || nil }
class EmailTestMailer < ActionMailer::Base
@ -40,16 +40,16 @@ message = EmailTestMailer.email_test(MAILFROM, MAILTO)
begin
message.deliver_now()
rescue SocketError => e
print "Delivery failed: "+e.message.strip()+"\n"
print "Delivery failed: " + e.message.strip() + "\n"
print " Is the server hostname correct?\n"
rescue OpenSSL::SSL::SSLError => e
print "Delivery failed: "+e.message.strip()+"\n"
print "Delivery failed: " + e.message.strip() + "\n"
print " You probably need to change the ssl verify mode.\n"
rescue Net::SMTPAuthenticationError => e
print "Delivery failed: "+e.message.strip()+"\n"
print "Delivery failed: " + e.message.strip() + "\n"
print " Check to ensure your username and password are correct.\n"
rescue Net::SMTPFatalError => e
print "Delivery failed: "+e.message.strip()+"\n"
print "Delivery failed: " + e.message.strip() + "\n"
print " Check the above error and fix your settings.\n"
else
print "Successfully delivered.\n"