Skip to content

Commit

Permalink
Merge branch 'master' into db_arch_hashing
Browse files Browse the repository at this point in the history
  • Loading branch information
dobooth authored Oct 29, 2019
2 parents 31fd37d + d47c7cd commit ec758ff
Show file tree
Hide file tree
Showing 1,092 changed files with 16,798 additions and 16,105 deletions.
20 changes: 10 additions & 10 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ religion, or sexual identity and orientation.
Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* Using sexualized language or imagery and unwelcome sexual attention or
* Using sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/BUG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ about: Create an issue about a bug on the devdocs website
<!-- (OPTIONAL) What needs to be done to replicate this issue? (provide Gist if needed) -->

1. First Step
2. Second Step
3. Etc.
1. Second Step
1. Etc.

## Expected result

Expand Down
24 changes: 12 additions & 12 deletions .github/ISSUE_TEMPLATE/COMMUNITY_ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,28 @@ about: Create an issue related to a community engineering effort

Type of Doc:

- [ ] New topic
- [ ] Topic Update, Devdoc link:
- [ ] Other
- [ ] New topic
- [ ] Topic Update, Devdoc link:
- [ ] Other

Magento 2 GitHub Issue: https://github.com/magento/devdocs/issues/link

Magento 2 GitHub PR: https://github.com/magento/devdocs/pull/link

Magento 2 version:

- [ ] 2.1.X
- [ ] 2.2.X
- [ ] 2.3.X
- [ ] back port
- [ ] forward port
- [ ] 2.1.X
- [ ] 2.2.X
- [ ] 2.3.X
- [ ] back port
- [ ] forward port

Notifications of Changes:

- [ ] Changes to Admin interface?
- [ ] New software requirements?
- [ ] New REST endpoints or updated GraphQL query syntax?
- [ ] New command line option?
- [ ] Changes to Admin interface?
- [ ] New software requirements?
- [ ] New REST endpoints or updated GraphQL query syntax?
- [ ] New command line option?

## Content

Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/NEW_TOPIC.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ about: Create a request to add missing information to devdocs

<!-- Use the following checklist template as a starting point -->

- [ ] The topic provides an explanation of how ____ works.
- [ ] The topic provides steps for ____.
- [ ] The topic contains code samples that shows ____.
- [ ] Other (please specify)
- [ ] The topic provides an explanation of how ____ works.
- [ ] The topic provides steps for ____.
- [ ] The topic contains code samples that shows ____.
- [ ] Other (please specify)

## Additional information/resources

Expand Down
10 changes: 5 additions & 5 deletions .github/MAINTAINER_GUIDELINES.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ Labels are important because they help us identify pull requests and ensure that

Here is a brief summary of the most important labels:

- `New Topic`: Entirely new documents
- `Major Update`: Significant new info: new section in existing topic, etc.
- `Technical`: Changes to technical content/code/processes/naming conventions (any change to technical content)
- `Editorial`: Typos, grammatical inconsistencies, or minor rewrites
- `small changes`: See [Small changes workflow](#small-changes-workflow)
- `New Topic`: Entirely new documents
- `Major Update`: Significant new info: new section in existing topic, etc.
- `Technical`: Changes to technical content/code/processes/naming conventions (any change to technical content)
- `Editorial`: Typos, grammatical inconsistencies, or minor rewrites
- `small changes`: See [Small changes workflow](#small-changes-workflow)

We also use version labels when appropriate.

Expand Down
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ This pull request (PR) ...

<!-- REQUIRED List the affected pages on devdocs.magento.com (URLs). Not needed for large numbers of files. -->

- ...
- ...

## Links to Magento source code

<!-- OPTIONAL - REMOVE THIS SECTION IF NOT USED. If this pull request references a file in a Magento codebase repository, add it here. -->

- ...
- ...

<!--
If you are fixing a GitHub issue, note it using GitHub keyword format (https://help.github.com/en/articles/closing-issues-using-keywords#closing-an-issue-in-a-different-repository) to close the issue when this pull request is merged. Example: `Fixes #1234`
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ on:
branches:
- master
- develop
paths:
- '*.md'

jobs:
test:
Expand All @@ -18,7 +16,7 @@ jobs:
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6
- name: Install gems
run: bundle install
- name: Install mdl gem
run: gem install mdl
- name: Run mdl
run: rake test:md
run: mdl --style=_checks/styles/style-rules-prod --ignore-front-matter --git-recurse -- .
7 changes: 1 addition & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

_config.local.yml
.jekyll-metadata
.jekyll-cache
.whatsup.yml

*.bat
Expand All @@ -28,9 +29,3 @@ _algolia_api_key
/page-builder-migration/
/guides/m1x/
/mftf/

# Docs from different branches #
###################################

/guides/v2.0/
/guides/v2.1/
6 changes: 6 additions & 0 deletions .imgbotconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"ignoredFiles": [
"*.svg"
],
"aggressiveCompression": false
}
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ gem 'wdm', platform: :mswin

group :test do
gem 'html-proofer'
gem 'mdl'
gem 'launchy'
end

Expand Down
77 changes: 35 additions & 42 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
GIT
remote: https://github.com/magento-devdocs/devdocs-theme.git
revision: 84a3ed7f0df264a2c2086167efbd7d0545d329c4
revision: 5e99a84dd5692d3ee4c1985b9f48824eeede8cfd
specs:
devdocs (4)
devdocs (5)
jekyll (>= 3.3)

GEM
Expand All @@ -13,7 +13,7 @@ GEM
algolia_html_extractor (2.6.2)
json (~> 2.0)
nokogiri (~> 1.10.4)
algoliasearch (1.27.0)
algoliasearch (1.27.1)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
colorator (1.1.0)
Expand All @@ -25,13 +25,13 @@ GEM
ffi (>= 1.3.0)
eventmachine (1.2.7)
exifr (1.3.6)
faraday (0.15.4)
faraday (0.17.0)
multipart-post (>= 1.2, < 3)
ffi (1.11.1)
filesize (0.2.0)
forwardable-extended (2.6.0)
fspath (3.1.2)
html-proofer (3.12.2)
html-proofer (3.13.0)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogiri (~> 1.10)
Expand All @@ -41,7 +41,7 @@ GEM
yell (~> 2.0)
http_parser.rb (0.6.0)
httpclient (2.8.3)
i18n (0.9.5)
i18n (1.7.0)
concurrent-ruby (~> 1.0)
image_optim (0.26.5)
exifr (~> 1.2, >= 1.2.2)
Expand All @@ -54,20 +54,22 @@ GEM
image_optim (~> 0.19)
image_size (2.0.2)
in_threads (1.5.3)
jekyll (3.8.6)
jekyll (4.0.0)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
i18n (>= 0.9.5, < 2)
jekyll-sass-converter (~> 2.0)
jekyll-watch (~> 2.0)
kramdown (~> 1.14)
kramdown (~> 2.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
rouge (~> 3.0)
safe_yaml (~> 1.0)
jekyll-algolia (1.5.0)
terminal-table (~> 1.8)
jekyll-algolia (1.6.0)
algolia_html_extractor (~> 2.6)
algoliasearch (~> 1.26)
filesize (~> 0.1)
Expand All @@ -76,45 +78,39 @@ GEM
nokogiri (~> 1.6)
progressbar (~> 1.9)
verbal_expressions (~> 0.1.5)
jekyll-optional-front-matter (0.3.0)
jekyll (~> 3.0)
jekyll-optional-front-matter (0.3.2)
jekyll (>= 3.0, < 5.0)
jekyll-redirect-from (0.15.0)
jekyll (>= 3.3, < 5.0)
jekyll-relative-links (0.6.0)
jekyll (~> 3.3)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-relative-links (0.6.1)
jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (2.0.1)
sassc (> 2.0.1, < 3.0)
jekyll-sitemap (1.3.1)
jekyll (>= 3.7, < 5.0)
jekyll-titles-from-headings (0.5.1)
jekyll (~> 3.3)
jekyll-titles-from-headings (0.5.3)
jekyll (>= 3.3, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
json (2.2.0)
kramdown (1.17.0)
kramdown (2.1.0)
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
launchy (2.4.3)
addressable (~> 2.3)
liquid (4.0.3)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mdl (0.5.0)
kramdown (~> 1.12, >= 1.12.0)
mixlib-cli (~> 1.7, >= 1.7.0)
mixlib-config (~> 2.2, >= 2.2.1)
listen (3.2.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_portile2 (2.4.0)
mixlib-cli (1.7.0)
mixlib-config (2.2.18)
tomlrb
multipart-post (2.1.1)
netrc (0.11.0)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
parallel (1.17.0)
parallel (1.18.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
progress (3.5.2)
Expand All @@ -124,21 +120,19 @@ GEM
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
rouge (3.11.0)
ruby_dep (1.5.0)
rouge (3.12.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sassc (2.2.1)
ffi (~> 1.9)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thor (0.20.3)
tomlrb (1.2.8)
typhoeus (1.3.1)
ethon (>= 0.9.0)
unicode-display_width (1.6.0)
verbal_expressions (0.1.5)
wdm (0.1.1)
whatsup_github (0.0.1)
Expand All @@ -164,7 +158,6 @@ DEPENDENCIES
jekyll-sitemap
jekyll-titles-from-headings
launchy
mdl
wdm
whatsup_github

Expand Down
23 changes: 0 additions & 23 deletions _checks/md_check_hook.rb

This file was deleted.

Loading

0 comments on commit ec758ff

Please sign in to comment.