Merge branch '2.4-develop' into 26909-grouped-product-restapi

magento · Nov 11, 2020 · 24c27a4 · 24c27a4
2 parents fa4c7b8 + f8dd0b5
commit 24c27a4
Show file tree

Hide file tree

Showing 1,497 changed files with 53,918 additions and 13,048 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -10,3 +10,9 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.{yml,yaml,json}]
+indent_size = 2
+
+[{composer, auth}.json]
+indent_size = 4
diff --git a/.github/stale.yml b/.github/stale.yml
@@ -1,7 +1,7 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
 # Number of days of inactivity before an Issue or Pull Request becomes stale
- daysUntilStale: 76
+daysUntilStale: 76
 
 # Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
 # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
@@ -18,7 +18,7 @@ exemptLabels:
   - "Progress: dev in progress"
   - "Progress: PR in progress"
   - "Progress: done"
-  - "B2B: GraphQL"   
+  - "B2B: GraphQL"
   - "Progress: PR Created"
   - "PAP"
   - "Project: Login as Customer"

diff --git a/.gitignore b/.gitignore
@@ -58,6 +58,8 @@ atlassian*
 /pub/media/tmp/*
 !/pub/media/tmp/.htaccess
 /pub/media/captcha/*
+/pub/media/sitemap/*
+!/pub/media/sitemap/.htaccess
 /pub/static/*
 !/pub/static/.htaccess