Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

[MM-31018] Update email address for admin advisor contact requests to [email protected] #7145

Merged
merged 7 commits into from
Dec 17, 2020

Conversation

jasonblais
Copy link
Contributor

@jasonblais jasonblais commented Dec 1, 2020

Summary

Update email address for admin advisor contact requests to [email protected]

Ticket Link

https://mattermost.atlassian.net/browse/MM-31018

Related Pull Requests

mattermost/mattermost#16443

@jasonblais jasonblais added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Dec 1, 2020
@jasonblais
Copy link
Contributor Author

Please review carefully, to make sure I haven't missed a file.

@amyblais I would like to get this into v5.30 if possible. It is not a must-have though, so if I missed a code deadline, let me know and we'll queue for v5.31.

@amyblais
Copy link
Member

amyblais commented Dec 1, 2020

This is for v5.31 - v5.30 will be based on the cloud release we did last week Tuesday - https://community-release.mattermost.com/private-core/pl/aa5m38ngg3dgfd6d3ma4pbbwne.

@jasonblais jasonblais added this to the v5.31.0 milestone Dec 1, 2020
@srkgupta srkgupta requested review from furqanmlk and removed request for srkgupta December 2, 2020 14:08
Copy link
Member

@jespino jespino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@amyblais amyblais removed this from the v5.31.0 milestone Dec 9, 2020
@jasonblais
Copy link
Contributor Author

/update-branch

@jasonblais
Copy link
Contributor Author

@furqanmlk please help with QA review :)

@furqanmlk
Copy link
Contributor

@furqanmlk please help with QA review :)
@jasonblais
I am in the process of review.
For some reason I don’t see expected email address. I will confirm with Rohit and update.
Sorry about the delay as I am new to this feature :)

@jasonblais
Copy link
Contributor Author

All good :) If any questions, let me know

Copy link
Contributor

@furqanmlk furqanmlk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Advisory Banner Acknowledge button still sending email to [email protected].
Please see the attachment for reference

Advisory Banner

image

Advisory Banner Mailto:email address

image

@furqanmlk
Copy link
Contributor

Advisory Banner email us shows correct email address

image

@jasonblais
Copy link
Contributor Author

@catalintomai is this something you can assist with as well? I'm not able to find where in the code we are setting the acknowledge button to send the email to [email protected]

@catalintomai
Copy link
Contributor

catalintomai commented Dec 13, 2020

@jasonblais , you will need to update the MM_SUPPORT_ADDRESS value in mattermost-server/model/config.go. cc: @furqanmlk

@jasonblais
Copy link
Contributor Author

@catalintomai I assume this will change the email address for all other places where that constant is used? The intention is to only change it for the admin advisor notifications.

@catalintomai
Copy link
Contributor

@catalintomai I assume this will change the email address for all other places where that constant is used? The intention is to only change it for the admin advisor notifications.

@jasonblais, I introduced the constant for AdminAdvisor purposes, fwik it is not used anywhere else.

@jasonblais
Copy link
Contributor Author

That's great, thanks Catalin! I've made the update in the corresponding server PR: mattermost/mattermost#16443 (comment)

@jasonblais jasonblais removed the 2: Dev Review Requires review by a core commiter label Dec 13, 2020
Copy link
Contributor

@furqanmlk furqanmlk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested Contact Us and Email Us button are sending email to [email protected].
Test cases have been created for the same feature
MM-T3656

@jasonblais jasonblais changed the title [MM-31018] Update mailto: email address for admin advisor contact requests to [email protected] [MM-31018] Update email address for admin advisor contact requests to [email protected] Dec 14, 2020
@jasonblais
Copy link
Contributor Author

/update-branch

@jasonblais
Copy link
Contributor Author

/update-branch

@jasonblais
Copy link
Contributor Author

@catalintomai Any guidance on why the tests suddenly fail? No changes were made, other than updating to the master branch with /update-branch.

Otherwise the PR is ready to merge.

@catalintomai
Copy link
Contributor

@jasonblais , you have to run a "make check-style" and address the errors. From the test results, it looks like there are some semicolons missing.

@jasonblais
Copy link
Contributor Author

Thanks @catalintomai for the quick response. I actually made these changes via the UI and don't have the environment running locally to execute make check-style. That said, I only updated the email address and should have no missing semicolons.

image

@catalintomai
Copy link
Contributor

catalintomai commented Dec 15, 2020

@jasonblais - the failures are not related to your changes (you can click on the failure link above to get the exact set) - not clear how they made their way into master - I see the errors on my enlistment as well. I suspect they'll be fixed soon (tomorrow) and you should be able to check-in.

@jasonblais
Copy link
Contributor Author

/update-branch

@jasonblais jasonblais added AutoMerge used by Mattermod to merge PR automatically and removed 3: QA Review Requires review by a QA tester labels Dec 17, 2020
@mattermod
Copy link
Contributor

Will try to auto merge this PR once all tests and checks are passing. This might take up to an hour.

@mattermod
Copy link
Contributor

Trying to auto merge this PR.

@mattermod mattermod merged commit d8b6d5f into mattermost:master Dec 17, 2020
@mattermod
Copy link
Contributor

Pull Request successfully merged
SHA: d8b6d5f

@mattermod mattermod removed the AutoMerge used by Mattermod to merge PR automatically label Dec 17, 2020
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Dec 17, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation
Projects
None yet
6 participants