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.

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

MM-41813 Fix path to fonts loaded by plugin #4852

Merged
merged 1 commit into from
Aug 10, 2023
Merged

Conversation

hmhealey
Copy link
Contributor

Summary

The Boards plugin has been trying to load the fonts that it packages from the wrong place for a while now. These fonts aren't actually necessary because the MM web app also loads the same fonts from a different location (/static/<some-hash>.woff2), but I figured it would be less likely to break something if I fixed that instead of removing the CSS that includes that font file.

Ticket Link

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

@hmhealey hmhealey added the 2: Dev Review Requires review by a core committer label Aug 10, 2023
@hmhealey hmhealey requested a review from sbishel August 10, 2023 17:05
@sbishel sbishel added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Aug 10, 2023
@sbishel sbishel added this to the v7.11 milestone Aug 10, 2023
@sbishel sbishel added 3: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core committer labels Aug 10, 2023
@sbishel sbishel merged commit 4038d84 into main Aug 10, 2023
@sbishel sbishel deleted the MM-41813_fix-font-urls branch August 10, 2023 18:07
@mattermost-build
Copy link
Contributor

Cherry pick is scheduled.

@mattermost-build
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.114.3' to the list of known hosts (/app/.ssh/known_hosts).
From github.com:mattermost/focalboard
   3625c535..4038d847  main               -> upstream/main
   dca1b064..b8a51306  release-7.11       -> upstream/release-7.11
 * [new tag]           cloud-2023-08-09-1 -> cloud-2023-08-09-1
Fetching origin
Failed to add the RSA host key for IP address '140.82.114.3' to the list of known hosts (/app/.ssh/known_hosts).
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-focalboard-#4852-upstream-release-7.11-1691690878
Switched to a new branch 'automated-cherry-pick-of-focalboard-#4852-upstream-release-7.11-1691690878'
Branch 'automated-cherry-pick-of-focalboard-#4852-upstream-release-7.11-1691690878' set up to track remote branch 'release-7.11' from 'upstream'.

+++ About to attempt cherry pick of PR #4852 with merge commit 4038d8471e37e0e0a4ca82f7f21b649782b48e75.

error: commit 4038d8471e37e0e0a4ca82f7f21b649782b48e75 is a merge but no -m option was given.
fatal: cherry-pick failed
!!! git cherry-pick failed

+++ Aborting in-progress git cherry-pick.

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

sbishel added a commit that referenced this pull request Aug 10, 2023
MM-41813 Fix path to fonts loaded by plugin

(cherry picked from commit 4038d84)
sbishel added a commit that referenced this pull request Aug 10, 2023
Merge pull request #4852 from mattermost/MM-41813_fix-font-urls
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3: Reviews Complete All reviewers have approved the pull request CherryPick/Approved Meant for the quality or patch release tracked in the milestone
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants