From 4a14069f4437d6e6794f117d53156cae777ae75d Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Thu, 4 Oct 2018 10:42:08 -0700 Subject: [PATCH 1/6] Release 2.0 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 2e6a238..451551b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ammonia" -version = "1.2.0" +version = "2.0.0" authors = ["Michael Howell "] description = "HTML Sanitization" keywords = [ "sanitization", "html", "security", "xss" ] From bca05ba70f10dbd990487858d82ac0a0f5a3c7ab Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Thu, 4 Oct 2018 10:45:53 -0700 Subject: [PATCH 2/6] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fa0d92..e6c57dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ * +# 2.0.0 + +* Add "script" and "style" to the default set of [clean content tags] + +[clean content tags]: https://docs.rs/ammonia/1.2.0/ammonia/struct.Builder.html#method.clean_content_tags + # 1.2.0 * Recognize `action`, `formaction` and `ping` as [URL attributes] for scheme and origin filtering From afb1654d07695658ea53deda3bfd5e8231ae7393 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Thu, 4 Oct 2018 13:59:43 -0700 Subject: [PATCH 3/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f275023..fa2ab5a 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ To use `ammonia`, add it to your project's `Cargo.toml` file: ```toml [dependencies] -ammonia = "1.2.0" +ammonia = "2" ``` From 7fd523d0e7e84549fac10b43150c5a6fda6dc8d4 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Fri, 28 Dec 2018 11:59:07 -0700 Subject: [PATCH 4/6] Add #92 to the changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6c57dc..5633ea9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ # 2.0.0 * Add "script" and "style" to the default set of [clean content tags] +* Make all iterator-accepting APIs use `IntoIterator` and `Borrow`, so that you can pass slices directly to them. [clean content tags]: https://docs.rs/ammonia/1.2.0/ammonia/struct.Builder.html#method.clean_content_tags From 35b5c2cd3329a3efd4759215f22067e90c067b8a Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Fri, 28 Dec 2018 12:11:45 -0700 Subject: [PATCH 5/6] Fix link to 2.0.0 documentation --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5633ea9..18cffb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ * Add "script" and "style" to the default set of [clean content tags] * Make all iterator-accepting APIs use `IntoIterator` and `Borrow`, so that you can pass slices directly to them. -[clean content tags]: https://docs.rs/ammonia/1.2.0/ammonia/struct.Builder.html#method.clean_content_tags +[clean content tags]: https://docs.rs/ammonia/2.0.0/ammonia/struct.Builder.html#method.clean_content_tags # 1.2.0 From 8f134270ce22d21552df0e4e58bbe336d17f417a Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Fri, 28 Dec 2018 12:13:14 -0700 Subject: [PATCH 6/6] Fix link to 1.2 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18cffb8..54cb68d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ * Add [`Builder::url_filter_map`] which allows URLs, both relative and absolute, to be pre-filtered [URL attributes]: https://html.spec.whatwg.org/multipage/indices.html#attributes-3 -[`Builder::url_filter_map`]: https://docs.rs/ammonia/1.1/ammonia/struct.Builder.html#method.url_filter_map +[`Builder::url_filter_map`]: https://docs.rs/ammonia/1.2/ammonia/struct.Builder.html#method.url_filter_map # 1.1.0