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

[MM-32138] - Fix margin of history arrows without unread filter button #7366

Merged
merged 1 commit into from
Jan 22, 2021
Merged

[MM-32138] - Fix margin of history arrows without unread filter button #7366

merged 1 commit into from
Jan 22, 2021

Conversation

nevyangelova
Copy link
Contributor

Summary

Fix the alignment of the history arrows on desktop app when the unread category is enabled.

Ticket Link

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

V.5.32

@nevyangelova nevyangelova added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Jan 21, 2021
@nevyangelova nevyangelova added this to the v5.32.0 milestone Jan 21, 2021
@jgilliam17 jgilliam17 added the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Jan 21, 2021
jgilliam17
jgilliam17 approved these changes Jan 21, 2021
View reviewed changes
Copy link
Contributor

@jgilliam17 jgilliam17 left a comment

Choose a reason for hiding this comment

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

Thanks @nevyangelova
Tested, looks good to merge.

  • Verified on desktop app, history arrow are aligned with find channel button when unread filter is not present.

@jgilliam17 jgilliam17 added QA Review Done and removed 3: QA Review Requires review by a QA tester labels Jan 21, 2021
@hmhealey hmhealey merged commit 50229ed into master Jan 22, 2021
@hmhealey hmhealey deleted the MM-32138 branch January 22, 2021 18:25
@mattermod mattermod removed the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Jan 22, 2021
@mattermod
Copy link
Contributor

Cherry pick is scheduled.

@mm-cloud-bot
Copy link

Test server destroyed

@mattermod
Copy link
Contributor

Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
Failed to add the RSA host key for IP address '140.82.113.4' to the list of known hosts (/app/.ssh/known_hosts).
From github.com:mattermost/mattermost-webapp
   f24093b36..a97993620  MM-31914-use-new-renewal-link -> upstream/MM-31914-use-new-renewal-link
 * [new branch]          MM-32156_gm-loading -> upstream/MM-32156_gm-loading
 + 6567481ef...ce68f110d campaign/applytheme_away-indicator -> upstream/campaign/applytheme_away-indicator  (forced update)
 + 10e089708...941d7dd1a campaign/applytheme_center-channel-bg -> upstream/campaign/applytheme_center-channel-bg  (forced update)
   387760f5f..b14142618  campaign/applytheme_center-channel-color -> upstream/campaign/applytheme_center-channel-color
 + 49ad70b63...ff1da8f17 campaign/applytheme_online-indicator -> upstream/campaign/applytheme_online-indicator  (forced update)
 + 62eed45b2...d5bd767cb campaign/applytheme_sidebar-header-text-color -> upstream/campaign/applytheme_sidebar-header-text-color  (forced update)
   6550db078..c593f3c96  cloud               -> upstream/cloud
   dd6c640f2..6ac0aa027  disablecomp         -> upstream/disablecomp
   f2fea6dbd..f8ce1d4d2  feature/collapsed-reply-threads -> upstream/feature/collapsed-reply-threads
 * [new branch]          form-field-styling  -> upstream/form-field-styling
   ff893260c..50229ed51  master              -> upstream/master
Fetching origin
Failed to add the RSA host key for IP address '140.82.113.4' to the list of known hosts (/app/.ssh/known_hosts).
From github.com:mattermost-build/mattermost-webapp
   a641f9b81..a4a617a89  automated-cherry-pick-of-mattermost-webapp-#7367-upstream-cloud -> origin/automated-cherry-pick-of-mattermost-webapp-#7367-upstream-cloud
+++ Updating remotes done...
!!! 'upstream/release-5.32' not found. The second argument should be something like upstream/release-0.21.
    (In particular, it needs to be a valid, existing remote branch that I can 'git checkout'.)

+++ Returning you to the master branch and cleaning up.

@mm-cloud-bot
Copy link

Test server destroyed

@hmhealey
Copy link
Member

/cherry-pick cloud

@mattermod
Copy link
Contributor

Cherry pick is scheduled.

mattermost-build pushed a commit to mattermost-build/mattermost-webapp that referenced this pull request Jan 22, 2021
@nevyangelova @mattermost-build
[MM-32138] - Fix margin of history arrows without unread filter button (
788aa89 
mattermost#7366)

Co-authored-by: Nevyana Angelova <[email protected]>
(cherry picked from commit 50229ed)
@mattermost-build mattermost-build mentioned this pull request Jan 22, 2021
Merged
@mattermod mattermod added CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone and removed CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Jan 22, 2021
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation and removed 2: Dev Review Requires review by a core commiter labels Jan 22, 2021
hmhealey pushed a commit that referenced this pull request Jan 22, 2021
@mattermost-build @nevyangelova
[MM-32138] - Fix margin of history arrows without unread filter button (
8358a0b 
#7366) (#7382)

Co-authored-by: Nevyana Angelova <[email protected]>
(cherry picked from commit 50229ed)

Co-authored-by: Nev Angelova <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@hmhealey hmhealey hmhealey approved these changes

@devinbinnie devinbinnie devinbinnie approved these changes

@jgilliam17 jgilliam17 jgilliam17 approved these changes

Assignees
No one assigned
Labels
Changelog/Not Needed Does not require a changelog entry CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone Docs/Not Needed Does not require documentation QA Review Done
Projects
None yet
Milestone
v5.32.0
7 participants
@nevyangelova @mattermod @mm-cloud-bot @hmhealey @devinbinnie @jgilliam17 @amyblais