SKA: Misc code enhancements to reduce merge conflicts#204785

Merged

gsoldevila merged 3 commits intoelastic:mainfrom

gsoldevila:fix-styled-components-files

Dec 19, 2024

Contributor

gsoldevila commented Dec 18, 2024 •

edited by kibanamachine

Loading

Summary

packages/kbn-babel-preset/styled_components_files.js
- unfolded a|b patterns
- removed duplicates
- removed incorrect patterns
x-pack/.gitignore
- move plugin patterns to specific .gitignore files


          Unwrap / cleanup / sort patterns

6d0a6d9

gsoldevila added Team:Core release_note:skip backport:prev-minor labels

gsoldevila requested review from a team as code owners

December 18, 2024 15:49

Contributor

elasticmachine commented Dec 18, 2024

Pinging @elastic/kibana-core (Team:Core)

gsoldevila mentioned this pull request

[ObsUX] [APM] Migrate APM from styled-components to @emotion #204222

Merged

Dosant approved these changes

View reviewed changes

gsoldevila force-pushed the fix-styled-components-files branch from 71a660a to 9ce78ab Compare

December 18, 2024 15:58


          Update x-pack .gitignore

71b506a

gsoldevila force-pushed the fix-styled-components-files branch from 9ce78ab to 71b506a Compare

December 18, 2024 16:05

delanni approved these changes

View reviewed changes

gsoldevila enabled auto-merge (squash)

December 18, 2024 16:58

Contributor

elasticmachine commented Dec 18, 2024

💚 Build Succeeded

Buildkite Build
Commit: 71b506a

Metrics [docs]

✅ unchanged


          Merge branch 'main' into fix-styled-components-files

8c5ce31

gsoldevila merged commit e8e4e75 into elastic:main

kibanamachine added the v9.0.0 label

Contributor

kibanamachine commented Dec 19, 2024

Starting backport for target branches: 8.x

https://github.com/elastic/kibana/actions/runs/12408728828

Contributor

kibanamachine commented Dec 19, 2024

💔 All backports failed

Status	Branch	Result
❌	8.x	Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 204785

Questions ?

Please refer to the Backport tool documentation

JoseLuisGJ pushed a commit to JoseLuisGJ/kibana that referenced this pull request


          SKA: Misc code enhancements to reduce merge conflicts (elastic#204785)

e2f5964

## Summary

* `packages/kbn-babel-preset/styled_components_files.js`
  * unfolded `a|b` patterns
  * removed duplicates
  * removed incorrect patterns

* `x-pack/.gitignore`
  * move plugin patterns to specific `.gitignore` files

kibanamachine added the backport missing label

Contributor

kibanamachine commented Dec 20, 2024

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

6 similar comments

Contributor

kibanamachine commented Dec 23, 2024

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Dec 24, 2024

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Dec 25, 2024

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Dec 26, 2024

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Dec 27, 2024

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Dec 30, 2024

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Jan 20, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

2 similar comments

Contributor

kibanamachine commented Jan 22, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Jan 23, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

viduni94 pushed a commit to viduni94/kibana that referenced this pull request


          SKA: Misc code enhancements to reduce merge conflicts (elastic#204785)

891e51b

## Summary

* `packages/kbn-babel-preset/styled_components_files.js`
  * unfolded `a|b` patterns
  * removed duplicates
  * removed incorrect patterns

* `x-pack/.gitignore`
  * move plugin patterns to specific `.gitignore` files

Contributor

kibanamachine commented Jan 24, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

12 similar comments

Contributor

kibanamachine commented Jan 27, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Jan 28, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Jan 29, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Jan 30, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Jan 31, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Feb 3, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Feb 4, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Feb 5, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Feb 6, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Feb 7, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Feb 10, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Feb 11, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

rudolf added the plugin groups label

Contributor

kibanamachine commented Feb 12, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

8 similar comments

Contributor

kibanamachine commented Feb 13, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Feb 14, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Feb 17, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Feb 18, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Feb 19, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Feb 20, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Feb 21, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Contributor

kibanamachine commented Feb 24, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

gsoldevila added backport:skip and removed backport missing backport:prev-minor labels

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:skip plugin groups release_note:skip Team:Core v9.0.0