Allow emails to be turned off per deployment #720
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Please rebase this branch to our updated master. We just incorporated a lot of new changes into our current master branch. Fix the conflicts accordingly. |
kayla-glick
reviewed
Nov 3, 2016
| @@ -51,8 +51,7 @@ def notification_received(user, ssr) | |||
| private | |||
|
|
|||
| def send_message subject, is_service_provider='false', ssr_id='' | |||
| email = Rails.env == 'production' ? @send_to.email : DEFAULT_MAIL_TO | |||
| subject = Rails.env == 'production' ? subject : "[#{Rails.env.capitalize} - EMAIL TO #{@send_to.email}] #{subject}" | |||
| email = @send_to.email | |||
There was a problem hiding this comment.
subject is missing here now. Is this intentional?
There was a problem hiding this comment.
Yes intentional, subject is passed straight through to mail.
Otherwise it would have been subject = subject I think
chrisortman
force-pushed
the
email-sending-rules
branch
from
aa3b4a0
to
8e07b0b
Compare
|
Rebase completed. Please see also the lines I've marked with ##Review they didn't look correct in the original code to me. |
|
Hey Chris. Can you look into the test failures? We'll get it merged in as soon as it's passing on Travis. |
chrisortman
force-pushed
the
email-sending-rules
branch
from
dec1cf8
to
a076fb1
Compare
chrisortman
force-pushed
the
email-sending-rules
branch
from
a076fb1
to
99d3200
Compare
jleonardw9
approved these changes
Nov 17, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We needed to be able to disable sending of emails to real users in our test and staging environments, but relying on a check for the Rails environment is problematic and was duplicated in several places in the code.
This change removes the duplication and contains the logic in a single place. It also moves the setting to application.yml.
This setting is intentionally off by default so that someone couldn't accidentally deploy to testing and have it start sending emails on them.
I created this branch based on the release-1.8.0 tag thinking that it would then not pick up any changes that were not ready to be released. But it looks like the tags get created off musc_production but musc_production has stuff that's not in master?