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

[BUGFIX] Use correct object to call pushModuleData() method in AdminModuleController #225

Merged
merged 3 commits into from
Nov 22, 2023

Conversation

brotkrueml
Copy link
Contributor

Resolves: #222
Releases: main, 12.4

…oduleController

Resolves: #222
Releases: main, 12.4
@brotkrueml brotkrueml self-assigned this Nov 6, 2023
@brotkrueml brotkrueml marked this pull request as draft November 6, 2023 09:00
@brotkrueml brotkrueml marked this pull request as ready for review November 6, 2023 16:58
@brotkrueml brotkrueml requested a review from linawolf November 6, 2023 16:58
@brotkrueml brotkrueml merged commit 3daeb59 into main Nov 22, 2023
10 checks passed
@brotkrueml brotkrueml deleted the issue-222 branch November 22, 2023 07:07
Copy link

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 128
stderr
error: commit 3f64e771b26b0f440c24ad0a31e5857266c59f9f is a merge but no -m option was given.
fatal: cherry-pick failed

stdout
[backport-225-to-12.4 cba445f] [BUGFIX] Use correct object to call pushModuleData() method in AdminModuleController
 Author: Chris Müller <[email protected]>
 Date: Mon Nov 6 09:59:40 2023 +0100
 1 file changed, 7 insertions(+), 1 deletion(-)

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-225-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b3db9783a5e63a3d0b10c03ea168c7a9db32b155,3f64e771b26b0f440c24ad0a31e5857266c59f9f,f858a45601d7cc86d101331ccb97271a3a6ba370
# Push it to GitHub
git push --set-upstream origin backport-225-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

Then, create a pull request where the base branch is 12.4 and the compare/head branch is backport-225-to-12.4.

brotkrueml added a commit that referenced this pull request Nov 22, 2023
…oduleController (#225)

Resolves: #222
Releases: main, 12.4
brotkrueml added a commit that referenced this pull request Nov 22, 2023
…oduleController (#225) (#227)

Resolves: #222
Releases: main, 12.4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Needs to be beUser instead of languageService
2 participants