Merge branch 'master' into imported-magento-devdocs-8890

smooth80 · Apr 27, 2021 · f0b6675 · f0b6675
2 parents da0e68e + bb53b26
commit f0b6675
Show file tree

Hide file tree

Showing 99 changed files with 2,254 additions and 490 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,31 @@
+# Each line is a file pattern followed by one or more owners.
+# Learn more at: https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
+
+# All .rb files
+*.rb @dshevtsov
+
+# All .rake files
+*.rake @dshevtsov
+
+# All .sh files
+*.sh @dshevtsov
+
+# All files at the root directory, non-recursively.
+/* @dshevtsov
+
+# All files at the /.github/linters/ directory and in sub-directories.
+/.github/linters/ @dshevtsov
+
+# All files at the /.github/workflows/ directory and in sub-directories.
+/.github/workflows/ @dshevtsov
+
+# All files at the /.github/bin/ directory and in sub-directories.
+/bin/ @dshevtsov
+
+/docker-compose.yaml @hguthrie
+
+LICENSE.txt @jeff-matthews
+
+COPYING.txt @jeff-matthews
+
+CODEOWNERS @jeff-matthews @dshevtsov
diff --git a/.gitignore b/.gitignore
@@ -14,7 +14,6 @@
 _config.local.yml
 .jekyll-metadata
 .jekyll-cache
-.whatsup.yml
 
 *.bat
 /tmp/

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.6.6
+ruby-2.7.2
diff --git a/.whatsup.yml b/.whatsup.yml
@@ -0,0 +1,23 @@
+# Parameters for a GitHub search query
+base_branch: master
+
+repos:
+  - magento/devdocs
+  - magento-commerce/devdocs
+
+# Labels also will be used as a 'type' value in the output file
+labels:
+  required:
+    - New Topic
+    - Major Update
+  optional:
+    - Technical
+
+# Format of output file
+output_format:
+  - yaml
+#  - markdown
+
+magic_word: whatsnew
+
+membership: magento-commerce
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/magento-devdocs/devdocs-theme.git
-  revision: 0bd45b1e1816f5c94233c2c36403bc3242a6551a
+  revision: d3f9c3992d6b5b450c4dd7c75a2b5b6bf4e3786c
   specs:
     devdocs (14)
       jekyll (>= 4.0)
@@ -10,29 +10,32 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    algolia_html_extractor (2.6.2)
+    algolia_html_extractor (2.6.4)
       json (~> 2.0)
-      nokogiri (~> 1.10.4)
-    algoliasearch (1.27.2)
+      nokogiri (~> 1.10)
+    algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
-    chef-utils (16.4.41)
+    chef-utils (16.12.3)
     colorator (1.1.0)
-    concurrent-ruby (1.1.6)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.1.8)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     ethon (0.12.0)
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
-    exifr (1.3.6)
-    faraday (1.0.1)
+    exifr (1.3.9)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.12.2)
+      ruby2_keywords
+    faraday-net_http (1.0.1)
+    ffi (1.15.0)
     filesize (0.2.0)
     forwardable-extended (2.6.0)
     fspath (3.1.2)
-    html-proofer (3.15.3)
+    html-proofer (3.18.8)
       addressable (~> 2.3)
       mercenary (~> 0.3)
       nokogumbo (~> 2.0)
@@ -42,37 +45,37 @@ GEM
       yell (~> 2.0)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    i18n (1.8.2)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    image_optim (0.26.5)
+    image_optim (0.28.0)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (>= 1.5, < 3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    image_optim_pack (0.6.0.20200215)
+    image_optim_pack (0.7.0.20210206)
       fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
-    image_optim_pack (0.6.0.20200215-x86_64-darwin)
+    image_optim_pack (0.7.0.20210206-x86_64-darwin)
       fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
-    image_size (2.0.2)
+    image_size (2.1.0)
     in_threads (1.5.4)
-    jekyll (4.1.0)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
       jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
       mercenary (~> 0.4.0)
       pathutil (~> 0.9)
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
+      terminal-table (~> 2.0)
     jekyll-algolia (1.6.0)
       algolia_html_extractor (~> 2.6)
       algoliasearch (~> 1.26)
@@ -96,15 +99,15 @@ GEM
       jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.3.0)
-    kramdown (2.3.0)
+    json (2.5.1)
+    kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     launchy (2.5.0)
       addressable (~> 2.7)
     liquid (4.0.3)
-    listen (3.2.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mdl (0.11.0)
@@ -114,53 +117,58 @@ GEM
       mixlib-config (>= 2.2.1, < 4)
       mixlib-shellout
     mercenary (0.4.0)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.9)
       tomlrb
-    mixlib-shellout (3.1.4)
+    mixlib-shellout (3.2.5)
       chef-utils
     multipart-post (2.1.1)
     netrc (0.11.0)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.2)
+    nokogiri (1.11.2)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    nokogiri (1.11.2-x86_64-darwin)
+      racc (~> 1.4)
+    nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
-    octokit (4.18.0)
+    octokit (4.20.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.19.1)
+    parallel (1.20.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    progress (3.5.2)
-    progressbar (1.10.1)
-    public_suffix (4.0.5)
+    progress (3.6.0)
+    progressbar (1.11.0)
+    public_suffix (4.0.6)
+    racc (1.5.2)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.3)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.4)
-    rouge (3.19.0)
+    rexml (3.2.5)
+    rouge (3.26.0)
+    ruby2_keywords (0.0.4)
     safe_yaml (1.0.5)
-    sassc (2.3.0)
+    sassc (2.4.0)
       ffi (~> 1.9)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    terminal-table (1.8.0)
+    terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.20.3)
-    tomlrb (1.3.0)
+    thor (1.1.0)
+    tomlrb (2.0.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
     unicode-display_width (1.7.0)
     verbal_expressions (0.1.5)
     wdm (0.1.1)
-    whatsup_github (0.3.1)
-      netrc (~> 0.10)
-      octokit (~> 4.14)
-      thor (~> 0.20)
+    whatsup_github (0.4.1)
+      netrc (~> 0.11)
+      octokit (~> 4.20)
+      thor (~> 1.1)
     yell (2.2.2)
 
 PLATFORMS
@@ -188,4 +196,4 @@ DEPENDENCIES
   whatsup_github
 
 BUNDLED WITH
-   1.17.3
+   2.2.15
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -1,8 +1,8 @@
-version: '3.6'
+version: '3.7'
 
 services:
   jekyll:
-    image: jekyll/jekyll:3.8.6
+    image: jekyll/jekyll:4.2.0
     command: jekyll serve --watch --incremental --open-url --livereload
     ports:
       - 4000:4000

diff --git a/rakelib/symlink.rake b/rakelib/symlink.rake
@@ -43,7 +43,7 @@ namespace :symlink do
 
     abort "Failed: Couldn't find the '#{new_path}' file to copy from".red unless path.exist?
 
-    sh "git rm #{path}"
+    sh "rm #{path}"
     sh "cp #{new_path} #{path}"
 
     puts "Finished: replaced symlink with file at '#{path}'".green

diff --git a/src/_data/mde.yml b/src/_data/mde.yml
@@ -374,7 +374,7 @@ extensions:
     name: Product Recommendations
     versions:
       -
-        name: 3.2.3
+        name: 3.2.4
         support:
           2.3.0: supported
           2.3.1: supported
@@ -386,6 +386,19 @@ extensions:
           2.4.0: supported
           2.4.1: supported
           2.4.2: supported
+      -
+        name: 3.2.3
+        support:
+          2.3.0: compatible
+          2.3.1: compatible
+          2.3.2: compatible
+          2.3.3: compatible
+          2.3.4: compatible
+          2.3.5-p1: compatible
+          2.3.6: compatible
+          2.4.0: compatible
+          2.4.1: compatible
+          2.4.2: compatible
       -
         name: 3.2.2
         support:
@@ -398,6 +411,7 @@ extensions:
           2.3.6: compatible
           2.4.0: compatible
           2.4.1: compatible
+          2.4.2: compatible
       -
         name: 3.10.0
         support:

diff --git a/src/_data/toc/ui-components-guide.yml b/src/_data/toc/ui-components-guide.yml
@@ -53,7 +53,6 @@ pages:
 
         - label: ColumnsResize component
           url: /ui_comp_guide/components/ui-columns-resize.html
-          exclude_versions: ["2.2"]
 
         - label: ColumnsControls component
           url: /ui_comp_guide/components/ui-columnscontrols.html
@@ -285,6 +284,10 @@ pages:
         - label: Declare a custom UI component
           url: /ui_comp_guide/howto/new_component_declaration.html
 
+        - label: Show or Hide Password Checkbox
+          url: /ui_comp_guide/howto/show_or_hide_password_checkbox.html
+          exclude_versions: ["2.3"]
+
     - label: Troubleshoot
       children:
 

diff --git a/src/_data/var.yml b/src/_data/var.yml
@@ -21,22 +21,21 @@ mbi: Magento Business Intelligence
 # Cloud product name variables
 
 ece: Magento Commerce Cloud
-ece-release-date: Feb 1, 2021
+ece-release-date: April 20, 2021
 csuite: Magento Commerce Cloud Suite
 ct: ece-tools
 ct-repo: magento/ece-tools
-ct-release: 2002.1.5
+ct-release: 2002.1.6
 mcp-prod: Magento Cloud Patches
 mcp-package: magento/magento-cloud-patches
 mcp-release: 1.0.9
 mcd-package: magento/magento-cloud-docker
 mcd-prod: Magento Cloud Docker
-mcd-release: 1.2.1
+mcd-release: 1.2.2
 mcc-prod: Magento Cloud Components
 mcc-package: magento/magento-cloud-components
 mcc-release: 1.0.7
 
-
 # TIP: Use the following syntax to use a variable in the documentation source: {{site.data.var.xx}} where xx
 # is the variable value.