Skip to content

Commit

Permalink
Merge branch 'master' into jorgeorpinel
Browse files Browse the repository at this point in the history
  • Loading branch information
jorgeorpinel committed Nov 4, 2019
2 parents 956fbdc + ed114f1 commit fa1ef73
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 7 deletions.
4 changes: 4 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
}
},
"rules": {
"max-len": [
"error",
{ "code": 80, "ignoreTemplateLiterals": true, "ignoreUrls": true }
],
"no-tabs": "error"
}
}
1 change: 1 addition & 0 deletions src/Documentation/Markdown/Markdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const HeadingRenderer = ({ level, children }) => {
>
<path
fillRule="evenodd"
// eslint-disable-next-line max-len
d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"
></path>
</svg>
Expand Down
1 change: 1 addition & 0 deletions src/Documentation/SidebarMenu/helper.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ describe('SidebarMenu/helper', () => {
)
})

// eslint-disable-next-line max-len
it("Throws error if item has source: false and doesn't have children", () => {
const rawData = [{ slug: 'item-name', source: false }]

Expand Down
13 changes: 7 additions & 6 deletions src/Documentation/glossary.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ Initialized by running \`dvc init\` in the **workspace**. It will contain the
desc: `
The DVC cache is a hidden storage (by default located in the \`.dvc/cache\`
directory) for files that are under DVC control, and their different versions.
For more details, please refer to this
[document](/doc/user-guide/dvc-files-and-directories#structure-of-cache-directory).
For more details, please refer to this [document]
(/doc/user-guide/dvc-files-and-directories#structure-of-cache-directory).
`
},
{
Expand All @@ -43,8 +43,8 @@ For more details, please refer to this
desc: `
Any data file or directory, as well as intermediate or final result (such as
extracted features or a ML model file) that is under DVC control. Refer to
[Versioning Data and Model Files](/doc/use-cases/versioning-data-and-model-files)
for more details.
[Versioning Data and Model Files]
(/doc/use-cases/versioning-data-and-model-files) for more details.
`
},
{
Expand All @@ -68,8 +68,9 @@ A file or a directory that is under DVC control. See \`dvc add\` \`dvc run\`,
match: ['external dependency', 'external dependencies'],
desc: `
A DVC-file dependency with origin in an external source, for example HTTP, SSH,
Amazon S3, Google Cloud Storage remote locations, or even other DVC repositories.
See [External Dependencies](/doc/user-guide/external-dependencies).
Amazon S3, Google Cloud Storage remote locations, or even other DVC
repositories. See [External Dependencies]
(/doc/user-guide/external-dependencies).
`
}
]
Expand Down
5 changes: 4 additions & 1 deletion src/SubscribeForm/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ export default function SubscribeForm() {
required
/>

{/*real people should not fill this in and expect good things - do not remove this or risk form bot signups*/}
{/*
real people should not fill this in and expect good things -
do not remove this or risk form bot signups
*/}
<div style={{ position: 'absolute', left: '-5000px' }} aria-hidden="true">
<input
type="text"
Expand Down

0 comments on commit fa1ef73

Please sign in to comment.