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

i18n - extracting new, pulling from tx #10453

Merged
merged 2 commits into from
Feb 19, 2025

Conversation

ColeHiggins2
Copy link
Contributor

(cherry picked from commit 6a98a34)

@ColeHiggins2 ColeHiggins2 requested a review from ekohl February 19, 2025 17:40
@ColeHiggins2 ColeHiggins2 self-assigned this Feb 19, 2025
@pr-processor pr-processor bot added Not yet reviewed Stable branch PRs that are opened against a stable branch. Usually a cherry pick Waiting on contributor labels Feb 19, 2025
@github-actions github-actions bot added the Legacy JS PRs making changes in the legacy Javascript stack label Feb 19, 2025
@ColeHiggins2
Copy link
Contributor Author

@ekohl Does this look correct? i ran tx-update after i cherrypicked in commit. but am not seeing any changes

@ekohl
Copy link
Member

ekohl commented Feb 19, 2025

(cherry picked from commit 6a98a34)

One small nit: when it was merged it became commit sha f9f1162 (because GitHub can't do fast forward merges and we don't use merge commits)., otherwise it looks correct.

@ColeHiggins2
Copy link
Contributor Author

@ekohl can we merge so I can tag?

@ekohl
Copy link
Member

ekohl commented Feb 19, 2025

There was an implicit "please cherry pick from the correct commit sha" in there. Mind doing that?

@ColeHiggins2
Copy link
Contributor Author

Cherrypicking that commit returns "nothing to commit" @ekohl and I see no conflicts ...

@ColeHiggins2
Copy link
Contributor Author

@ekohl check now?

@ekohl ekohl merged commit 3c8c5fc into theforeman:3.14-stable Feb 19, 2025
26 of 29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Legacy JS PRs making changes in the legacy Javascript stack Stable branch PRs that are opened against a stable branch. Usually a cherry pick Waiting on contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants