Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V4 dev backports and updates #32035

Merged
merged 7 commits into from Nov 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintignore
Expand Up @@ -4,4 +4,3 @@
/_gh_pages/
/js/coverage/
/site/sw.js
/package.js
7 changes: 6 additions & 1 deletion .eslintrc.json
Expand Up @@ -21,7 +21,12 @@
"warn",
5
],
"new-cap": "off",
"new-cap": [
"error",
{
"properties": false
}
],
"no-console": "error",
"no-mixed-operators": "off",
"no-negated-condition": "off",
Expand Down
6 changes: 4 additions & 2 deletions .github/CONTRIBUTING.md
Expand Up @@ -124,10 +124,12 @@ Good pull requests—patches, improvements, new features—are a fantastic
help. They should remain focused in scope and avoid containing unrelated
commits.

**Please ask first** before embarking on any significant pull request (e.g.
**Please ask first** before embarking on any **significant** pull request (e.g.
implementing features, refactoring code, porting to a different language),
otherwise you risk spending a lot of time working on something that the
project's developers might not want to merge into the project.
project's developers might not want to merge into the project. For trivial
things, or things that don't require a lot of your time, you can go ahead and
make a PR.

Please adhere to the [coding guidelines](#code-guidelines) used throughout the
project (indentation, accurate comments, etc.) and any other requirements
Expand Down
5 changes: 1 addition & 4 deletions CODE_OF_CONDUCT.md
Expand Up @@ -40,7 +40,4 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html][version]

[homepage]: https://www.contributor-covenant.org/
[version]: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org/), version 1.4, available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct/>
2 changes: 1 addition & 1 deletion js/tests/unit/tooltip.js
Expand Up @@ -1170,7 +1170,7 @@ $(function () {
})

var tooltip = $trigger.data('bs.tooltip')
assert.strictEqual(tooltip.config.template.indexOf('script'), -1)
assert.strictEqual(tooltip.config.template.indexOf('href="javascript:alert(7)"'), -1)
})

QUnit.test('should allow custom sanitization rules', function (assert) {
Expand Down