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

PLT-5871 Fix permalink in email for DMs/GMs #5751

Merged
merged 1 commit into from Mar 13, 2017
Merged

PLT-5871 Fix permalink in email for DMs/GMs #5751

merged 1 commit into from Mar 13, 2017

Conversation

jwilander
Copy link
Member

Summary

Fix permalink in email for DMs/GMs

Ticket Link

https://mattermost.atlassian.net/browse/PLT-5871

@jwilander jwilander added 2: Dev Review Requires review by a developer Work In Progress Not yet ready for review and removed 2: Dev Review Requires review by a developer labels Mar 13, 2017
@jwilander jwilander force-pushed the plt-5871 branch 2 times, most recently from 2ca12fa to 53c540d Compare March 13, 2017 17:07
@jwilander jwilander added 2: Dev Review Requires review by a developer and removed Work In Progress Not yet ready for review labels Mar 13, 2017
@jwilander
Copy link
Member Author

@crspeller might want to look at this for the performance considerations for sending DMs

@jwilander jwilander added this to the v3.7.0 milestone Mar 13, 2017
enahum
enahum approved these changes Mar 13, 2017
View reviewed changes
Copy link
Contributor

@enahum enahum left a comment

Choose a reason for hiding this comment

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

well lets hope this doesn't have a performance hit

@hmhealey
Copy link
Member

@jwilander Shouldn't team.Id be non-empty and channel.Id always be empty for DM and GM channels? I must not understand the whole situation here

@jwilander
Copy link
Member Author

team will be an empty struct for DMs since we don't pull the team for DMs anymore

@hmhealey
Copy link
Member

Oh I see. It used to pass down the current team there even for DM channels, but now it doesn't.

@grundleborg grundleborg merged commit ca90fe5 into release-3.7 Mar 13, 2017
@grundleborg grundleborg deleted the plt-5871 branch March 13, 2017 17:20
@jasonblais jasonblais mentioned this pull request Mar 13, 2017
Closed
enahum pushed a commit that referenced this pull request Mar 16, 2017
@jwilander @enahum
Fix permalink in email for DMs/GMs (#5751)
a05097a
@jasonblais jasonblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Mar 23, 2017
@lindalumitchell lindalumitchell added the Tests/Not Needed New release tests not required label Mar 27, 2017
danmaas added a commit to spinpunch/battlehouse-mattermost that referenced this pull request Sep 8, 2017
@danmaas
Merge v3.7.6 from mainline into battlehouse-v3.7.x
1a15de2 
* commit '51cdce09634cd30ce9e23095c86ddc9f680671d7': (37 commits)
  Email fix
  Update channel header
  Minor fix
  Fixed detection of HTTPS without a proxy (mattermost#6232)
  Use host header for successful OAuth redirect (mattermost#6220)
  Invite salt fix for 3.8 (mattermost#6149)
  PLT-6368 Changed client to always use window.location.origin over SiteURL (3.7) (mattermost#6191)
  PLT-5900 Removed automatic configuration of Site URL (mattermost#6135)
  Fix configuration setting
  PLT-5702 Added special error page for private browsing error message (mattermost#5985) (mattermost#6023)
  PLT-6207: Fix EE policy application. (mattermost#5997)
  PLT-5905 Fix saml certificates for 3.7 (mattermost#5843)
  Fix telemetry. (mattermost#5841)
  Fxing some unit tests
  PLT-5943 Reduce minimum username length (mattermost#5798)
  Fix policy application in team edition. (mattermost#5771)
  PLT-5804 Fix email blue error not showing up (mattermost#5749)
  Fix permalink in email for DMs/GMs (mattermost#5751)
  Report correct session for React Native app (mattermost#5734)
  PLT-5800 Cleaned up duplicated code for adding slack attachments to posts (mattermost#5711)
  ...

# Conflicts:
#	api/post.go
#	app/channel.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hmhealey hmhealey hmhealey approved these changes

@enahum enahum enahum approved these changes

Assignees

@grundleborg grundleborg

Labels
2: Dev Review Requires review by a developer Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation Tests/Not Needed New release tests not required
Projects
None yet
Milestone
v3.7.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@jwilander @hmhealey @enahum @grundleborg @jasonblais @lindalumitchell