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

Fix cards not deleting properly. #4746

Merged
merged 4 commits into from
May 31, 2023
Merged

Fix cards not deleting properly. #4746

merged 4 commits into from
May 31, 2023

Conversation

crspeller
Copy link
Contributor

Summary

Fixes cards not deleting properly.

Ticket Link

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

@crspeller crspeller added the 2: Dev Review Requires review by a core committer label May 25, 2023
Copy link
Collaborator

@sbishel sbishel left a comment

Choose a reason for hiding this comment

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

A couple minor things, clean up.

server/services/store/sqlstore/blocks.go Outdated Show resolved Hide resolved
server/app/blocks.go Outdated Show resolved Hide resolved
server/services/store/sqlstore/blocks.go Outdated Show resolved Hide resolved
@crspeller crspeller requested a review from sbishel May 26, 2023 17:26
@crspeller crspeller marked this pull request as ready for review May 26, 2023 17:26
@sbishel sbishel requested a review from esarafianou May 30, 2023 17:20
@sbishel sbishel added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label May 30, 2023
@sbishel
Copy link
Collaborator

sbishel commented May 30, 2023

Will need to cp -> release-7.10, release-7.9, release-7.8.

Copy link

@esarafianou esarafianou left a comment

Choose a reason for hiding this comment

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

LGTM!

@sbishel sbishel merged commit c3b1c82 into main May 31, 2023
@sbishel sbishel deleted the files-fix branch May 31, 2023 14:26
@sbishel
Copy link
Collaborator

sbishel commented May 31, 2023

/cherry-pick release-7.10

@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.113.3' to the list of known hosts (/app/.ssh/known_hosts).
From github.com:mattermost/focalboard
   252f2138..c3b1c82b  main               -> upstream/main
 * [new branch]        cloud-2023-05-19-backup -> upstream/cloud-2023-05-19-backup
 * [new branch]        cloud-2023-05-24-backup -> upstream/cloud-2023-05-24-backup
   8de46aff..265529c3  release-7.1        -> upstream/release-7.1
   df5456ad..304afa9e  release-7.10       -> upstream/release-7.10
   6fc1d9f8..134be30d  release-7.8        -> upstream/release-7.8
   6556a8dd..70893582  release-7.9        -> upstream/release-7.9
 * [new branch]        remove-product-references -> upstream/remove-product-references
 * [new tag]           cloud-2023-05-22-1 -> cloud-2023-05-22-1
 * [new tag]           cloud-2023-05-23-1 -> cloud-2023-05-23-1
Fetching origin
Failed to add the RSA host key for IP address '140.82.113.3' to the list of known hosts (/app/.ssh/known_hosts).
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-focalboard-#4746-upstream-release-7.10-1685543983
Switched to a new branch 'automated-cherry-pick-of-focalboard-#4746-upstream-release-7.10-1685543983'
Branch 'automated-cherry-pick-of-focalboard-#4746-upstream-release-7.10-1685543983' set up to track remote branch 'release-7.10' from 'upstream'.

+++ About to attempt cherry pick of PR #4746 with merge commit c3b1c82b1a6727c6eb69c611c6316cc555bc0f9a.

error: could not apply c3b1c82b... Fix cards not deleting properly. (#4746)
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 server/app/blocks.go
Aborting.

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

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

sbishel pushed a commit that referenced this pull request May 31, 2023
* Fix cards not deleting properly.

* Review feedback

* Test and lint fixes.

* Fix tests.

(cherry picked from commit c3b1c82)
sbishel pushed a commit that referenced this pull request May 31, 2023
* Fix cards not deleting properly.

* Review feedback

* Test and lint fixes.

* Fix tests.

(cherry picked from commit c3b1c82)
sbishel pushed a commit that referenced this pull request May 31, 2023
* Fix cards not deleting properly.

* Review feedback

* Test and lint fixes.

* Fix tests.

(cherry picked from commit c3b1c82)
sbishel added a commit that referenced this pull request May 31, 2023
* Fix cards not deleting properly.

* Review feedback

* Test and lint fixes.

* Fix tests.

(cherry picked from commit c3b1c82)

Co-authored-by: Christopher Speller <[email protected]>
sbishel added a commit that referenced this pull request May 31, 2023
* Fix cards not deleting properly.

* Review feedback

* Test and lint fixes.

* Fix tests.

(cherry picked from commit c3b1c82)

Co-authored-by: Christopher Speller <[email protected]>
sbishel added a commit that referenced this pull request May 31, 2023
* Fix cards not deleting properly. (#4746)

* Fix cards not deleting properly.

* Review feedback

* Test and lint fixes.

* Fix tests.

(cherry picked from commit c3b1c82)

* fix bad merge

---------

Co-authored-by: Christopher Speller <[email protected]>
Co-authored-by: Mattermost Build <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2: Dev Review Requires review by a core committer 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.

5 participants