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

Release/6.0.0 #769

Merged
merged 123 commits into from
May 3, 2022
Merged

Release/6.0.0 #769

merged 123 commits into from
May 3, 2022

Conversation

supercid
Copy link
Member

@supercid supercid commented May 3, 2022

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Documentation:

Checklist:

  • My code follows the code style of this project.
  • I have updated the documentation accordingly.
  • All new and existing tests passed.
  • I have assigned the correct milestone or created one if non-existent.
  • I have correctly labeled this pull request.
  • I have linked the corresponding issue in this description.
  • I have updated the corresponding Jira ticket.
  • I have requested a review from at least 2 reviewers
  • I have checked the base branch of this pull request
  • I have checked my code for any possible security vulnerabilities

dairbuirabass and others added 30 commits November 24, 2021 10:15
@dairbuirabass
Update phan to latest
a66eafc
@dairbuirabass
Update drenso/phan-extensions to latest
f71919e
@dairbuirabass
Update more suppressed issues to phan.php
a69b037
@dairbuirabass
Modify path manager
a492889
@dairbuirabass
Add PhanTypeMismatchArgumentSuperType suppression
e7ecc4d
@dairbuirabass
Remove global suppressions, add line new and update old line suppress…
74be0bb 
…ions
@dairbuirabass
Add suppress to StockRegistryProvider
104d65b
@dairbuirabass
Change PhanTypeMismatchArgument to PhanTypeMismatchArgumentSuperType
7e43061
@dairbuirabass
Delete Dockerfile
f85543b
@dairbuirabass
Revert "Delete Dockerfile"
11f0776 
This reverts commit f85543b.
@dairbuirabass
Add comments to suppresions for future reference
e63a915
@dairbuirabass
Change composer version in Package job, add cache-files-dir config
d325fdb
@dairbuirabass
Remove cache from phpmd
fc4f5f3
@dairbuirabass
Remove cache from phpmd (fully)
d17f3e1
Update GoogleCategory.php
c5c4e8d
Merge pull request #756 from Nosto/feature/bump-phan
f2a9fe4 
Update phan/phan and drenso/phan-extensions to latest
@olsi-qose
Merge branch 'master' into develop
f93093e
@dairbuirabass
Revert workflow commits and delete Dockerfile
9e60858
Merge branch 'develop' into feature/delete-dockerfile
445668c
@dairbuirabass
Merge branch 'master' into develop
3ae25b5
Merge branch 'develop' into feature/delete-dockerfile
f9e06b5
Merge pull request #757 from Nosto/feature/delete-dockerfile
c2e0588 
Delete Dockerfile
@chapagain
Fix error logged on out of stock configurable product
789bb15
@chapagain
Merge branch 'develop' into bug/fix-error-on-out-of-stock-configurabl…
cfbc64f 
…e-product
@supercid
Remove unused properties
2af7da0
@supercid
Remove unused properties
0b97417
@supercid
Remove PII data
8727a3a
@supercid
Remove PII data
94559c6
@supercid
Remove PII data
f43ae28
@supercid
Bump version and update changelog
07624bd
dairbuirabass and others added 20 commits April 13, 2022 15:28
@dairbuirabass
Update nosto/php-sdk
94178b5
@dairbuirabass
Update workflow composer installation to update phpseclib
d65c494
@dairbuirabass
Fix old phpseclib reference
2284c85
@dairbuirabass
Update workflow composer installation to update phpseclib
5d845d7
@dairbuirabass
Update workflow composer installation to update phpseclib
114010c
@supercid
Update magento base version on action IDE and PHAN
a89702e
@supercid
Update magento base version on action IDE and PHAN
de5688e
@olsi-qose
Merge branch 'master' into develop
bee4390 
# Conflicts:
#	CHANGELOG.md
#	composer.json
#	etc/module.xml
@supercid
Suppress return
660ef56
@supercid
Suppress return
d51365e
@supercid
Suppress return
5da5812
@dairbuirabass
Remove unused product_caching feature flag default value
5fc3b3a
@dairbuirabass
Merge branch 'feature/2.4.4-compatibility' of github.com:Nosto/nosto-…
49b0077 
…magento2 into feature/2.4.4-compatibility
@supercid
SKU builder null check
7212272
@supercid
Fix product data table size
a2fd5d4
@supercid
Merge remote-tracking branch 'origin/develop' into feature/2.4.4-comp…
5319cfc 
…atibility
@supercid
Bump php-sdk to 5.8.1
8c3cacd
@supercid
Bump compile.sh Magento version
2f72bd8
@supercid
Cosmetics in Helper/Price
ffb49e7
@supercid
Merge pull request #766 from Nosto/feature/2.4.4-compatibility
3dee14d 
Feature/2.4.4 compatibility
@supercid supercid requested review from olsi-qose and dairbuirabass and removed request for olsi-qose May 3, 2022 09:31
@supercid supercid enabled auto-merge May 3, 2022 10:21
@supercid supercid disabled auto-merge May 3, 2022 10:22
@supercid supercid merged commit b4cc9f5 into master May 3, 2022
@supercid supercid deleted the release/6.0.0 branch May 3, 2022 10:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dairbuirabass dairbuirabass dairbuirabass approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@supercid @dairbuirabass @olsi-qose @chapagain