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

[MM-29615] Fixed subscription page so it doesn't load until subscription info is loaded #6766

Merged
merged 1 commit into from
Oct 13, 2020
Merged

[MM-29615] Fixed subscription page so it doesn't load until subscription info is loaded #6766

merged 1 commit into from
Oct 13, 2020

Conversation

devinbinnie
Copy link
Member

Summary

This PR stops the Subscription page from loading until the subscription info has fully loaded.

Ticket Link

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

@devinbinnie devinbinnie added the 2: Dev Review Requires review by a core commiter label Oct 13, 2020
@devinbinnie devinbinnie merged commit 28a8b5b into mattermost:master Oct 13, 2020
@devinbinnie
Copy link
Member Author

/cherry-pick cloud-ga

@mattermod
Copy link
Contributor

Cherry pick is scheduled.

@mattermod
Copy link
Contributor

mattermod commented Oct 13, 2020 •
edited by jira bot
Loading

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.112.4' to the list of known hosts (/app/.ssh/known_hosts).
From github.com:mattermost/mattermost-webapp
   a9f2d6c24..4eba8412b  campaign/applytheme_sidebar-text -> upstream/campaign/applytheme_sidebar-text
   03a147d13..10a30b479  campaign/applytheme_sidebar-text-active-border -> upstream/campaign/applytheme_sidebar-text-active-border
   859d7cb71..5ea49bc86  cloud-ga    -> upstream/cloud-ga
 * [new tag]             v5.28.0-rc2 -> v5.28.0-rc2
Fetching origin
Failed to add the RSA host key for IP address '140.82.112.4' to the list of known hosts (/app/.ssh/known_hosts).
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-webapp-#6766-upstream-cloud-ga-1602621952
Switched to a new branch 'automated-cherry-pick-of-mattermost-webapp-#6766-upstream-cloud-ga-1602621952'
Branch 'automated-cherry-pick-of-mattermost-webapp-#6766-upstream-cloud-ga-1602621952' set up to track remote branch 'cloud-ga' from 'upstream'.

+++ About to attempt cherry pick of PR #6766 with merge commit 28a8b5b401bcd78e11a56fb0a9b0d4eda537c404.

error: could not apply 28a8b5b40... [MM-29615] Fixed subscription page so it doesn't load until subscription info is loaded (#6766)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

+++ Conflicts detected:

UU components/admin_console/billing/billing_subscriptions.tsx
Aborting.

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

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

@devinbinnie
Copy link
Member Author

/cherry-pick cloud-ga

@mattermod
Copy link
Contributor

Cherry pick is scheduled.

mattermost-build pushed a commit to mattermost-build/mattermost-webapp that referenced this pull request Oct 13, 2020
@devinbinnie @mattermost-build
[MM-29615] Fixed subscription page so it doesn't load until subscript…
a7f703f 
…ion info is loaded (mattermost#6766)

(cherry picked from commit 28a8b5b)
@mattermost-build mattermost-build mentioned this pull request Oct 13, 2020
Merged
@mattermod mattermod added the CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone label Oct 13, 2020
marianunez pushed a commit that referenced this pull request Oct 13, 2020
@mattermost-build @devinbinnie
Automated cherry pick of #6766 (#6769)
717b049 
(cherry picked from commit 28a8b5b)

Co-authored-by: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
@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 Oct 13, 2020
Tak-Iwamoto pushed a commit to Tak-Iwamoto/mattermost-webapp that referenced this pull request Oct 14, 2020
Merge branch 'master' of github.com:Tak-Iwamoto/mattermost-webapp int…
cdc2288 
…o MM-20457

* 'master' of github.com:Tak-Iwamoto/mattermost-webapp: (87 commits)
  MM-T644 Integrations display on team where they were created (mattermost#6752)
  [MM-20478] Migrate post_header module to TypeScript (mattermost#6631)
  [MM-20599] Migrated select_team component to Typescript (mattermost#6574)
  MM-20554 Migrate 'components/delete_post_modal' module and associated tests to TypeScript (mattermost#6656)
  [MM-24436]- Add a threshold from bottom for new messages toast (mattermost#5828)
  [MM-20489] Migrate failed_post_options and its tests to typescript (mattermost#6717)
  [MM-28063] Cloud Telemetry - Admin Console (mattermost#6762)
  [MM-29559][MM-29558] Company Info Fixes (mattermost#6764)
  [MM-29557] [MM-29590] Update subscription when purchase modal closes (mattermost#6765)
  [MM-29615] Fixed subscription page so it doesn't load until subscription info is loaded (mattermost#6766)
  [MM-28064] Add telemetry in various places around cloud message banners (mattermost#6763)
  migrate changeCSS function CSS variable for mobile CSS .tutorial-steps__container selector. (mattermost#6743)
  [MM-27231]: cypress test for MM-T1837 (mattermost#6676)
  [MM-28062] Add telemetry for in-app purchase flow (mattermost#6760)
  MM-27454 - Contact Us and Billing Documentation Links (mattermost#6731)
  [MM-20514] Migrates components/password reset send link to typescript (mattermost#6584)
  Cloud Billing polish Soft GA (mattermost#6740)
  [MM-28221] Payment Info Edit/View (mattermost#6709)
  MM-T636 Description field for incoming and outgoing webhooks can hold 500 characters (mattermost#6682)
  Translations update from Weblate (mattermost#6748)
  ...
jfrerich pushed a commit that referenced this pull request Oct 23, 2020
@devinbinnie @jfrerich
[MM-29615] Fixed subscription page so it doesn't load until subscript…
235ed27 
…ion info is loaded (#6766)
calebroseland pushed a commit that referenced this pull request Oct 27, 2020
@devinbinnie @calebroseland
[MM-29615] Fixed subscription page so it doesn't load until subscript…
e9a6fba 
…ion info is loaded (#6766)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@marianunez marianunez marianunez approved these changes

@alifarooq0 alifarooq0 alifarooq0 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
Projects
None yet
Milestone
No milestone
5 participants
@devinbinnie @mattermod @marianunez @alifarooq0 @amyblais