Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit dc86e20

Browse files
authored
Merge branch 'master' into patch-3
2 parents 08da66f + 1780ebc commit dc86e20

File tree

424 files changed

+411
-1035
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

424 files changed

+411
-1035
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 3 deletions

.github/ISSUE_TEMPLATE/COMMUNITY_ISSUE_TEMPLATE.md

Lines changed: 1 addition & 5 deletions

.github/MAINTAINER_GUIDELINES.md

Lines changed: 1 addition & 1 deletion

Gemfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/magento-devdocs/devdocs-theme.git
3-
revision: e1a4ff6880d5047cb8e14ac44849aca8ffaecf2a
3+
revision: d72768697309f7f13af8a37073af776420f6c3a7
44
specs:
55
devdocs (7)
66
jekyll (>= 4.0)
@@ -17,7 +17,7 @@ GEM
1717
httpclient (~> 2.8, >= 2.8.3)
1818
json (>= 1.5.1)
1919
colorator (1.1.0)
20-
concurrent-ruby (1.1.5)
20+
concurrent-ruby (1.1.6)
2121
em-websocket (0.5.1)
2222
eventmachine (>= 0.12.9)
2323
http_parser.rb (~> 0.6.0)
@@ -27,7 +27,7 @@ GEM
2727
exifr (1.3.6)
2828
faraday (1.0.0)
2929
multipart-post (>= 1.2, < 3)
30-
ffi (1.12.1)
30+
ffi (1.12.2)
3131
filesize (0.2.0)
3232
forwardable-extended (2.6.0)
3333
fspath (3.1.2)
@@ -49,7 +49,7 @@ GEM
4949
image_size (>= 1.5, < 3)
5050
in_threads (~> 1.3)
5151
progress (~> 3.0, >= 3.0.1)
52-
image_optim_pack (0.6.0.20200116)
52+
image_optim_pack (0.6.0.20200215)
5353
fspath (>= 2.1, < 4)
5454
image_optim (~> 0.19)
5555
image_size (2.0.2)
@@ -84,7 +84,7 @@ GEM
8484
jekyll (>= 3.3, < 5.0)
8585
jekyll-relative-links (0.6.1)
8686
jekyll (>= 3.3, < 5.0)
87-
jekyll-sass-converter (2.0.1)
87+
jekyll-sass-converter (2.1.0)
8888
sassc (> 2.0.1, < 3.0)
8989
jekyll-sitemap (1.4.0)
9090
jekyll (>= 3.7, < 5.0)
@@ -96,8 +96,8 @@ GEM
9696
kramdown (2.1.0)
9797
kramdown-parser-gfm (1.1.0)
9898
kramdown (~> 2.0)
99-
launchy (2.4.3)
100-
addressable (~> 2.3)
99+
launchy (2.5.0)
100+
addressable (~> 2.7)
101101
liquid (4.0.3)
102102
listen (3.2.1)
103103
rb-fsevent (~> 0.10, >= 0.10.3)
@@ -114,11 +114,11 @@ GEM
114114
tomlrb
115115
multipart-post (2.1.1)
116116
netrc (0.11.0)
117-
nokogiri (1.10.8)
117+
nokogiri (1.10.9)
118118
mini_portile2 (~> 2.4.0)
119119
nokogumbo (2.0.2)
120120
nokogiri (~> 1.8, >= 1.8.4)
121-
octokit (4.15.0)
121+
octokit (4.16.0)
122122
faraday (>= 0.9)
123123
sawyer (~> 0.8.0, >= 0.5.3)
124124
parallel (1.19.1)
@@ -132,7 +132,7 @@ GEM
132132
rb-fsevent (0.10.3)
133133
rb-inotify (0.10.1)
134134
ffi (~> 1.0)
135-
rouge (3.15.0)
135+
rouge (3.16.0)
136136
safe_yaml (1.0.5)
137137
sassc (2.2.1)
138138
ffi (~> 1.9)
@@ -152,7 +152,7 @@ GEM
152152
netrc (~> 0.10)
153153
octokit (~> 4.14)
154154
thor (~> 0.20)
155-
yell (2.2.1)
155+
yell (2.2.2)
156156

157157
PLATFORMS
158158
ruby

_plugins/generators/mrg_pages.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ def generate(site)
2121

2222
# Data from '_data/codebase/mrg' as a Hash where
2323
# the filename is a key and its content is a value.
24-
mrg_data = @site.data['codebase']['mrg']
24+
mrg_data = @site.data['codebase']['v2_3']['mrg']
2525
# Loop through the hash where a key is assigned to a 'mod' (module is a
2626
# special token in Ruby and should not be used) and value is assigned to
2727
# 'metadata'.
28-
# For example, for '_data/codebase/mrg/NewModule.yml' that contains
28+
# For example, for '_data/codebase/v2_3/mrg/NewModule.yml' that contains
2929
#
3030
# title: Magento_NewModule
3131
# edition: ce

0 commit comments

Comments
 (0)