From 907e44fdafddb93ce97e8b6fa1fa0da8a0c506d4 Mon Sep 17 00:00:00 2001 From: Dmytro Shevtsov Date: Thu, 2 Mar 2023 12:33:46 -0600 Subject: [PATCH 1/2] Rename magento-devdocs to commerce-docs --- Docfile.yml | 2 +- Gemfile | 2 +- Gemfile.lock | 64 ++++++++++++++++++++++++------------------ README.md | 2 +- _config.yml | 2 +- rakelib/multirepo.rake | 2 +- 6 files changed, 41 insertions(+), 33 deletions(-) diff --git a/Docfile.yml b/Docfile.yml index 339f0b07391..610a3cbf342 100644 --- a/Docfile.yml +++ b/Docfile.yml @@ -7,7 +7,7 @@ content_map: filter: true - directory: src/mftf - repository: magento-devdocs/magento2-functional-testing-framework-public + repository: commerce-docs/magento2-functional-testing-framework-public branch: migrated-docs filter: true - diff --git a/Gemfile b/Gemfile index 55d297c215e..6d194bd0a21 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'devdocs', git: 'https://github.com/magento-devdocs/devdocs-theme.git' +gem 'devdocs', git: 'https://github.com/commerce-docs/devdocs-theme.git' gem 'jekyll' gem 'rake' gem 'whatsup_github' diff --git a/Gemfile.lock b/Gemfile.lock index fcbd187536a..f1f6360008b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GIT - remote: https://github.com/magento-devdocs/devdocs-theme.git + remote: https://github.com/commerce-docs/devdocs-theme.git revision: ec880cfbf9f79abe5628be4eab95db30a58839fa specs: devdocs (20) @@ -16,10 +16,10 @@ GEM algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) - chef-utils (18.0.185) + chef-utils (18.1.0) concurrent-ruby colorator (1.1.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) @@ -27,7 +27,7 @@ GEM ffi (>= 1.15.0) eventmachine (1.2.7) exifr (1.3.10) - faraday (2.7.2) + faraday (2.7.4) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) @@ -35,6 +35,9 @@ GEM filesize (0.2.0) forwardable-extended (2.6.0) fspath (3.1.2) + google-protobuf (3.22.0) + google-protobuf (3.22.0-arm64-darwin) + google-protobuf (3.22.0-x86_64-darwin) html-proofer (4.4.3) addressable (~> 2.3) mercenary (~> 0.3) @@ -48,21 +51,21 @@ GEM httpclient (2.8.3) i18n (1.12.0) concurrent-ruby (~> 1.0) - image_optim (0.31.2) + image_optim (0.31.3) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (>= 1.5, < 4) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_optim_pack (0.9.1.20221210) + image_optim_pack (0.9.1.20230212) fspath (>= 2.1, < 4) image_optim (~> 0.19) - image_optim_pack (0.9.1.20221210-x86_64-darwin) + image_optim_pack (0.9.1.20230212-x86_64-darwin) fspath (>= 2.1, < 4) image_optim (~> 0.19) image_size (3.2.0) in_threads (1.6.0) - jekyll (4.3.1) + jekyll (4.3.2) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -91,10 +94,10 @@ GEM jekyll (>= 3.0, < 5.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) - jekyll-relative-links (0.6.1) + jekyll-relative-links (0.7.0) jekyll (>= 3.3, < 5.0) - jekyll-sass-converter (2.2.0) - sassc (> 2.0.1, < 3.0) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) jekyll-titles-from-headings (0.5.3) @@ -106,10 +109,10 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - launchy (2.5.0) - addressable (~> 2.7) - liquid (4.0.3) - listen (3.7.1) + launchy (2.5.2) + addressable (~> 2.8) + liquid (4.0.4) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mdl (0.12.0) @@ -119,19 +122,19 @@ GEM mixlib-config (>= 2.2.1, < 4) mixlib-shellout mercenary (0.4.0) - mini_portile2 (2.8.0) + mini_portile2 (2.8.1) mixlib-cli (2.1.8) mixlib-config (3.0.27) tomlrb mixlib-shellout (3.2.7) chef-utils netrc (0.11.0) - nokogiri (1.13.10) + nokogiri (1.14.2) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.13.10-arm64-darwin) + nokogiri (1.14.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.13.10-x86_64-darwin) + nokogiri (1.14.2-x86_64-darwin) racc (~> 1.4) octokit (6.0.1) faraday (>= 1, < 3) @@ -140,20 +143,25 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) progress (3.6.0) - progressbar (1.11.0) + progressbar (1.12.0) public_suffix (5.0.1) - racc (1.6.1) + racc (1.6.2) rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) - rouge (4.0.0) + rouge (4.1.0) ruby2_keywords (0.0.5) safe_yaml (1.0.5) - sassc (2.4.0) - ffi (~> 1.9) + sass-embedded (1.58.3) + google-protobuf (~> 3.21) + rake (>= 10.0.0) + sass-embedded (1.58.3-arm64-darwin) + google-protobuf (~> 3.21) + sass-embedded (1.58.3-x86_64-darwin) + google-protobuf (~> 3.21) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) @@ -163,16 +171,16 @@ GEM tomlrb (2.0.3) typhoeus (1.4.0) ethon (>= 0.9.0) - unicode-display_width (2.3.0) + unicode-display_width (2.4.2) verbal_expressions (0.1.5) wdm (0.1.1) - webrick (1.7.0) - whatsup_github (0.5.0) + webrick (1.8.1) + whatsup_github (1.0.1) netrc (~> 0.11) octokit (~> 6.0) thor (~> 1.2) yell (2.2.2) - zeitwerk (2.6.6) + zeitwerk (2.6.7) PLATFORMS arm64-darwin-22 diff --git a/README.md b/README.md index 1bd9aa5c1b2..3f398f33124 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ You can build the site locally in the following ways: - [Installing the project dependencies locally](#build-locally) (Mac, Linux) - [Using Docker (docker-compose)](https://github.com/magento/devdocs/wiki/Build-DevDocs-with-Docker) (Mac, Linux, Windows) -- [Using a Vagrant virtual machine](https://github.com/magento-devdocs/vagrant-for-magento-devdocs) (Mac, Linux, Windows) +- [Using a Vagrant virtual machine](https://github.com/commerce-docs/vagrant-for-magento-devdocs) (Mac, Linux, Windows) - [Build DevDocs in Windows](https://github.com/magento/devdocs/wiki/Build-DevDocs-in-Windows) (Windows 7 & 10) - [Building older versions of the documentation](https://github.com/magento/devdocs/wiki/Build-DevDocs-with-Docker) diff --git a/_config.yml b/_config.yml index 1330f821cb8..aba968006cc 100644 --- a/_config.yml +++ b/_config.yml @@ -9,7 +9,7 @@ description: Adobe Commerce Developer Guide # the base protocol and domain url: https://devdocs.magento.com -# Site theme: https://github.com/magento-devdocs/devdocs-theme +# Site theme: https://github.com/commerce-docs/devdocs-theme # About themes in Jekyll: https://jekyllrb.com/docs/themes/ theme: devdocs diff --git a/rakelib/multirepo.rake b/rakelib/multirepo.rake index fdcdc615e75..b05fdc734ee 100644 --- a/rakelib/multirepo.rake +++ b/rakelib/multirepo.rake @@ -34,7 +34,7 @@ namespace :multirepo do abort 'Provide a directory name for the multirepo docs. Example: dir=src/mftf' unless dir abort "'#{dir}' directory already exists" if Dir.exist? dir unless repo - abort 'Provide a repository cloning URL (SSH).Example: repo=git@github.com:magento-devdocs/magento2-functional-testing-framework.git' + abort 'Provide a repository cloning URL (SSH).Example: repo=git@github.com:commerce-docs/magento2-functional-testing-framework.git' end abort 'Provide a branch name for the multirepo docs. Example: branch=master' unless branch From 8849998ec16ecef654d4eb97d00ba402cd29e484 Mon Sep 17 00:00:00 2001 From: Dmytro Shevtsov Date: Thu, 2 Mar 2023 12:58:59 -0600 Subject: [PATCH 2/2] Revert bundle update --- Gemfile.lock | 62 +++++++++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 35 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f1f6360008b..0f76f7672fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,10 +16,10 @@ GEM algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) - chef-utils (18.1.0) + chef-utils (18.0.185) concurrent-ruby colorator (1.1.0) - concurrent-ruby (1.2.2) + concurrent-ruby (1.1.10) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) @@ -27,7 +27,7 @@ GEM ffi (>= 1.15.0) eventmachine (1.2.7) exifr (1.3.10) - faraday (2.7.4) + faraday (2.7.2) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) @@ -35,9 +35,6 @@ GEM filesize (0.2.0) forwardable-extended (2.6.0) fspath (3.1.2) - google-protobuf (3.22.0) - google-protobuf (3.22.0-arm64-darwin) - google-protobuf (3.22.0-x86_64-darwin) html-proofer (4.4.3) addressable (~> 2.3) mercenary (~> 0.3) @@ -51,21 +48,21 @@ GEM httpclient (2.8.3) i18n (1.12.0) concurrent-ruby (~> 1.0) - image_optim (0.31.3) + image_optim (0.31.2) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (>= 1.5, < 4) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_optim_pack (0.9.1.20230212) + image_optim_pack (0.9.1.20221210) fspath (>= 2.1, < 4) image_optim (~> 0.19) - image_optim_pack (0.9.1.20230212-x86_64-darwin) + image_optim_pack (0.9.1.20221210-x86_64-darwin) fspath (>= 2.1, < 4) image_optim (~> 0.19) image_size (3.2.0) in_threads (1.6.0) - jekyll (4.3.2) + jekyll (4.3.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -94,10 +91,10 @@ GEM jekyll (>= 3.0, < 5.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) - jekyll-relative-links (0.7.0) + jekyll-relative-links (0.6.1) jekyll (>= 3.3, < 5.0) - jekyll-sass-converter (3.0.0) - sass-embedded (~> 1.54) + jekyll-sass-converter (2.2.0) + sassc (> 2.0.1, < 3.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) jekyll-titles-from-headings (0.5.3) @@ -109,10 +106,10 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - launchy (2.5.2) - addressable (~> 2.8) - liquid (4.0.4) - listen (3.8.0) + launchy (2.5.0) + addressable (~> 2.7) + liquid (4.0.3) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mdl (0.12.0) @@ -122,19 +119,19 @@ GEM mixlib-config (>= 2.2.1, < 4) mixlib-shellout mercenary (0.4.0) - mini_portile2 (2.8.1) + mini_portile2 (2.8.0) mixlib-cli (2.1.8) mixlib-config (3.0.27) tomlrb mixlib-shellout (3.2.7) chef-utils netrc (0.11.0) - nokogiri (1.14.2) + nokogiri (1.13.10) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.14.2-arm64-darwin) + nokogiri (1.13.10-arm64-darwin) racc (~> 1.4) - nokogiri (1.14.2-x86_64-darwin) + nokogiri (1.13.10-x86_64-darwin) racc (~> 1.4) octokit (6.0.1) faraday (>= 1, < 3) @@ -143,25 +140,20 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) progress (3.6.0) - progressbar (1.12.0) + progressbar (1.11.0) public_suffix (5.0.1) - racc (1.6.2) + racc (1.6.1) rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) - rouge (4.1.0) + rouge (4.0.0) ruby2_keywords (0.0.5) safe_yaml (1.0.5) - sass-embedded (1.58.3) - google-protobuf (~> 3.21) - rake (>= 10.0.0) - sass-embedded (1.58.3-arm64-darwin) - google-protobuf (~> 3.21) - sass-embedded (1.58.3-x86_64-darwin) - google-protobuf (~> 3.21) + sassc (2.4.0) + ffi (~> 1.9) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) @@ -171,16 +163,16 @@ GEM tomlrb (2.0.3) typhoeus (1.4.0) ethon (>= 0.9.0) - unicode-display_width (2.4.2) + unicode-display_width (2.3.0) verbal_expressions (0.1.5) wdm (0.1.1) - webrick (1.8.1) - whatsup_github (1.0.1) + webrick (1.7.0) + whatsup_github (0.5.0) netrc (~> 0.11) octokit (~> 6.0) thor (~> 1.2) yell (2.2.2) - zeitwerk (2.6.7) + zeitwerk (2.6.6) PLATFORMS arm64-darwin-22