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

Merge v19 to v20 #2294

Closed
wants to merge 31 commits into from
Closed

Merge v19 to v20 #2294

wants to merge 31 commits into from

Conversation

fballiano
Copy link
Contributor

Forward port all 1.9.4.x commits into v20.

Note: I fixed a small conflict generated by #2256

@github-actions github-actions bot added Component: Adminhtml Relates to Mage_Adminhtml Component: Catalog Relates to Mage_Catalog Component: lib/Varien Relates to lib/Varien Component: lib/* Relates to lib/* Component: Uploader Relates to Mage_Uploader labels Jul 8, 2022
@github-actions github-actions bot added composer Relates to composer.json JavaScript Relates to js/* labels Jul 9, 2022
@github-actions github-actions bot added Component: Api PageRelates to Mage_Api Component: CatalogInventory Relates to Mage_CatalogInventory labels Jul 12, 2022
@github-actions github-actions bot added Component: Core Relates to Mage_Core Component: Customer Relates to Mage_Customer Component: Directory Relates to Mage_Directory Component: Downloadable Relates to Mage_Downloadable Component: Sales Relates to Mage_Sales Component: Tag Relates to Mage_Tag Mage.php Relates to app/Mage.php labels Jul 12, 2022
@github-actions github-actions bot added the Component: Bundle Relates to Mage_Bundle label Jul 13, 2022
@addison74
Copy link
Contributor

Let's set a deadline by which to insert PRs after which it makes them go in OM20. Do you think 2 weeks would be good enough?

@elidrissidev
Copy link
Member

The PHPStan error is originating from my last PR 🙈 but it didn't show up because the composer error made the workflow not run fully.

fballiano and others added 3 commits July 13, 2022 17:00
@fballiano
Merge branch 'OpenMage:1.9.4.x' into merge_v19_to_v20
4005084
@addison74
Add missing translations for auto cache flushing config (#2308)
79ecbe8 
* Update system.xml

* Update Mage_Core.csv

* Update Mage_Core.csv

* Update system.xml

* Update system.xml

* Update Mage_Core.csv

* Update system.xml

* Update system.xml

* Update Mage_Core.csv

* Update system.xml

* Update Mage_Core.csv
@luigifab
Allow to rename api.php for better security (#2132)
0d99717
@elidrissidev
Copy link
Member

elidrissidev commented Jul 15, 2022 •
edited
Loading

The merge commits make the history look really ugly. Maybe we could instead select "Update with rebase" from the dropdown next to "Update branch" button for PRs that sync 19 with 20 branches if that won't cause another problem?

@fballiano
Copy link
Contributor Author

this is what github does when:

Schermata 2022-07-15 alle 22 27 55

@github-actions github-actions bot added Component: Api2 Relates to Mage_Api2 documentation translations Relates to app/locale labels Jul 15, 2022
@elidrissidev
Copy link
Member

There's also a button below this page:

image

I would not try it directly on this branch though, as I'm unsure whether it'll mess something up or not.

@fballiano
Copy link
Contributor Author

mmm i kinda don't know how to avoid the "merge commits" so I'll close this and reopen it when I'll be able to fix that properly.

@fballiano fballiano closed this Jul 18, 2022
@fballiano fballiano deleted the merge_v19_to_v20 branch July 18, 2022 12:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Component: Adminhtml Relates to Mage_Adminhtml Component: Api PageRelates to Mage_Api Component: Api2 Relates to Mage_Api2 Component: Bundle Relates to Mage_Bundle Component: Catalog Relates to Mage_Catalog Component: CatalogInventory Relates to Mage_CatalogInventory Component: Checkout Relates to Mage_Checkout Component: Core Relates to Mage_Core Component: Customer Relates to Mage_Customer Component: Directory Relates to Mage_Directory Component: Downloadable Relates to Mage_Downloadable Component: lib/Varien Relates to lib/Varien Component: lib/* Relates to lib/* Component: Sales Relates to Mage_Sales Component: Tag Relates to Mage_Tag Component: Uploader Relates to Mage_Uploader composer Relates to composer.json documentation environment JavaScript Relates to js/* Mage.php Relates to app/Mage.php translations Relates to app/locale
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@fballiano @addison74 @elidrissidev @sdecalom @luigifab @Flyingmana