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

[Backport 1.x] [Legacy Maps Plugin] Prevent reverse-tabnabbing #2934

Merged
merged 2 commits into from
Nov 29, 2022

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 19a2e4a from #2540.

Signed-off-by: Miki <miki@amazon.com>

Signed-off-by: Miki <miki@amazon.com>
(cherry picked from commit 19a2e4a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Josh Romero <rmerqg@amazon.com>
@joshuarrrr joshuarrrr merged commit c286743 into 1.x Nov 29, 2022
@github-actions github-actions bot deleted the backport/backport-2540-to-1.x branch November 29, 2022 18:14
@opensearch-trigger-bot
Copy link
Contributor Author

The backport to 1.3 failed:

The process '/usr/bin/git' failed with exit code 1

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-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-2934-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c28674388b20bcf386fc68f47fc73d0de9465259
# Push it to GitHub
git push --set-upstream origin backport/backport-2934-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

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

joshuarrrr pushed a commit to joshuarrrr/OpenSearch-Dashboards that referenced this pull request Nov 29, 2022
…earch-project#2934)

* [Legacy Maps Plugin] Prevent reverse-tabnabbing (opensearch-project#2540)

Signed-off-by: Miki <miki@amazon.com>

Signed-off-by: Miki <miki@amazon.com>
(cherry picked from commit 19a2e4a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* [Chore] Add changelog

Signed-off-by: Josh Romero <rmerqg@amazon.com>

Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Josh Romero <rmerqg@amazon.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Josh Romero <rmerqg@amazon.com>
(cherry picked from commit c286743)
joshuarrrr added a commit that referenced this pull request Nov 30, 2022
#2950)

* [Legacy Maps Plugin] Prevent reverse-tabnabbing (#2540)

Signed-off-by: Miki <miki@amazon.com>

Signed-off-by: Miki <miki@amazon.com>
(cherry picked from commit 19a2e4a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* [Chore] Add changelog

Signed-off-by: Josh Romero <rmerqg@amazon.com>

Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Josh Romero <rmerqg@amazon.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Josh Romero <rmerqg@amazon.com>
(cherry picked from commit c286743)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
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.

2 participants