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

Improve the board creation from channels #3415

Merged
merged 5 commits into from
Jul 27, 2022
Merged

Improve the board creation from channels #3415

merged 5 commits into from
Jul 27, 2022

Conversation

jespino
Copy link
Contributor

@jespino jespino commented Jul 25, 2022 •
edited
Loading

Fixes #3367

@jespino jespino requested a review from a team as a code owner July 25, 2022 12:51
@jespino jespino requested review from wiggin77 and Rajat-Dabade and removed request for a team July 25, 2022 12:51
@jespino jespino added this to the v7.2 milestone Jul 25, 2022
@jespino jespino added 2: Dev Review Requires review by a core committer CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Jul 25, 2022
@sbishel sbishel requested review from sbishel and removed request for wiggin77 July 25, 2022 21:56
@sbishel
Copy link
Collaborator

sbishel commented Jul 25, 2022

/update-branch

@sbishel
Copy link
Collaborator

sbishel commented Jul 25, 2022

I just noticed this is going directly to release-7.2, do we need this in main as well?

@jespino
Copy link
Contributor Author

jespino commented Jul 25, 2022

@sbishel yes, but main was broken for me because the multiproduct architecture and some dependency problems. It needs to be cherry picked to main

@jespino
Copy link
Contributor Author

jespino commented Jul 27, 2022

/update-branch

@jespino jespino merged commit 93bc9de into mattermost-community:release-7.2 Jul 27, 2022
@mattermod
Copy link
Contributor

Cherry pick is scheduled.

@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.114.3' to the list of known hosts (/app/.ssh/known_hosts).
From github.com:mattermost/focalboard
   ac717490..6d5fa273  main        -> upstream/main
   950e222e..93bc9de7  release-7.2 -> upstream/release-7.2
 * [new branch]        unlink-channel-confirmation -> upstream/unlink-channel-confirmation
   c5030a7b..fd9b62e0  userCtx     -> upstream/userCtx
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).
From github.com:mattermost-build/focalboard
   4e0ff0dd..25c0b051  automated-cherry-pick-of-focalboard-#3416-upstream-main -> origin/automated-cherry-pick-of-focalboard-#3416-upstream-main
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-focalboard-#3415-upstream-release-7.2-1658916650
Switched to a new branch 'automated-cherry-pick-of-focalboard-#3415-upstream-release-7.2-1658916650'
Branch 'automated-cherry-pick-of-focalboard-#3415-upstream-release-7.2-1658916650' set up to track remote branch 'release-7.2' from 'upstream'.

+++ About to attempt cherry pick of PR #3415 with merge commit 93bc9de731127d31c6d9a4c46f155fe8dab8f3fe.

The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git reset'
On branch automated-cherry-pick-of-focalboard-#3415-upstream-release-7.2-1658916650
Your branch is up to date with 'upstream/release-7.2'.

You are currently cherry-picking commit 93bc9de7.

nothing to commit, working tree clean
!!! git cherry-pick failed

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

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

@jespino
Copy link
Contributor Author

jespino commented Jul 27, 2022

/cherry-pick main

@mattermod
Copy link
Contributor

Cherry pick is scheduled.

mattermost-build pushed a commit to mattermost-build/focalboard that referenced this pull request Jul 27, 2022
@jespino @mattermost-build
Improve the board creation from channels (mattermost-community#3415)
9d08712 
* Improve the board creation from channels

* Fixing linter problem and adding channelID to the telemetry information

* Fixing and expanding a bit the tests

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
(cherry picked from commit 93bc9de)
@mattermost-build mattermost-build mentioned this pull request Jul 27, 2022
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 Jul 27, 2022
jespino added a commit that referenced this pull request Jul 27, 2022
@mattermost-build @jespino
Improve the board creation from channels (#3415) (#3433)
3da7ca8 
* Improve the board creation from channels

* Fixing linter problem and adding channelID to the telemetry information

* Fixing and expanding a bit the tests

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
(cherry picked from commit 93bc9de)

Co-authored-by: Jesús Espino <jespinog@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbishel sbishel sbishel approved these changes

@Rajat-Dabade Rajat-Dabade Awaiting requested review from Rajat-Dabade Rajat-Dabade was automatically assigned from mattermost/core-focalboard

Assignees
No one assigned
Labels
2: Dev Review Requires review by a core committer CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone
Projects
None yet
Milestone
v7.2
Development

Successfully merging this pull request may close these issues.
3 participants
@jespino @sbishel @mattermod