Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport Production > Staging #25236

Merged
merged 22 commits into from
Oct 4, 2018
Merged

Backport Production > Staging #25236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
234fa66
Merge pull request #25076 from code-dot-org/dtp_candidate_f6cbb88e
Erin007 Sep 27, 2018
7110b16
fix tutorial content mutation
wjordan Sep 28, 2018
675ae06
Merge pull request #25096 from code-dot-org/tutorials_cache_hotfix
wjordan Sep 28, 2018
4a4c4c8
Merge pull request #25121 from code-dot-org/dtp_candidate_727cdf70
islemaster Sep 28, 2018
5090d5e
Merge pull request #25164 from code-dot-org/dtp_candidate_a2e80e37
mehalshah Oct 1, 2018
cab8f77
Point the Apply Now link to prod instead of staging
mehalshah Oct 2, 2018
e6ba372
Merge pull request #25171 from code-dot-org/hotfix_production_apply_n…
mehalshah Oct 2, 2018
bbb82eb
Treat the string "false" as false
deploy-code-org Oct 2, 2018
a5106a8
Merge pull request #25175 from code-dot-org/hotfix-mc-level-12
joshlory Oct 2, 2018
a6aefa3
Merge pull request #25191 from code-dot-org/staging
deploy-code-org Oct 2, 2018
e31907f
Merge pull request #25190 from code-dot-org/dtp_candidate_b80bf88b
Hamms Oct 2, 2018
a3179e4
Merge pull request #25204 from code-dot-org/staging
deploy-code-org Oct 3, 2018
380f18a
Merge pull request #25205 from code-dot-org/staging
deploy-code-org Oct 3, 2018
157acee
Merge pull request #25208 from code-dot-org/staging
deploy-code-org Oct 3, 2018
d0b3239
Merge pull request #25210 from code-dot-org/staging
deploy-code-org Oct 3, 2018
a3141fb
Merge pull request #25211 from code-dot-org/dtp_candidate_157aceea
davidsbailey Oct 3, 2018
b93546a
Merge pull request #25214 from code-dot-org/staging
deploy-code-org Oct 3, 2018
8b1e851
Merge pull request #25221 from code-dot-org/staging
deploy-code-org Oct 3, 2018
768f341
Merge pull request #25226 from code-dot-org/staging
deploy-code-org Oct 4, 2018
190cf89
Merge pull request #25227 from code-dot-org/dtp_candidate_768f341e
aoby Oct 4, 2018
3b0b1fd
Send regional partner contact emails from teacher@code.org
islemaster Oct 4, 2018
5dcd49d
Merge pull request #25233 from code-dot-org/hotfix-email-from
islemaster Oct 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion dashboard/app/mailers/pd/regional_partner_contact_mailer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class Pd::RegionalPartnerContactMailer < ActionMailer::Base
NO_REPLY = 'Code.org <noreply@code.org>'
default from: 'Anthonette Peña <anthonette@code.org>'
default from: 'Anthonette Peña <teacher@code.org>'

def matched(form, rp_pm)
@form = form
Expand Down
8 changes: 4 additions & 4 deletions dashboard/test/models/pd/regional_partner_contact_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class Pd::RegionalPartnerContactTest < ActiveSupport::TestCase
mail = ActionMailer::Base.deliveries.first

assert_equal 'A teacher and/or administrator would like to connect with you', mail.subject
assert_equal ['anthonette@code.org'], mail.from
assert_equal ['teacher@code.org'], mail.from
assert_equal 2, ActionMailer::Base.deliveries.count
end

Expand All @@ -133,7 +133,7 @@ class Pd::RegionalPartnerContactTest < ActiveSupport::TestCase
mail = ActionMailer::Base.deliveries.first

assert_equal 'A teacher and/or administrator would like to connect with you', mail.subject
assert_equal ['anthonette@code.org'], mail.from
assert_equal ['teacher@code.org'], mail.from
assert_equal 3, ActionMailer::Base.deliveries.count
end

Expand All @@ -148,7 +148,7 @@ class Pd::RegionalPartnerContactTest < ActiveSupport::TestCase

assert_equal ['anthonette@code.org'], mail.to
assert_equal 'A school administrator wants to connect with Code.org', mail.subject
assert_equal ['anthonette@code.org'], mail.from
assert_equal ['teacher@code.org'], mail.from
assert_equal 2, ActionMailer::Base.deliveries.count
end

Expand All @@ -158,7 +158,7 @@ class Pd::RegionalPartnerContactTest < ActiveSupport::TestCase

assert_equal ['anthonette@code.org'], mail.to
assert_equal 'A school administrator wants to connect with Code.org', mail.subject
assert_equal ['anthonette@code.org'], mail.from
assert_equal ['teacher@code.org'], mail.from
assert_equal 2, ActionMailer::Base.deliveries.count
end

Expand Down