Merge branch 'master' into add-object-not-found

saleor · Dec 17, 2018 · 026db67 · 026db67
2 parents d4d8e13 + bf652d7
commit 026db67
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 132 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,4 +12,5 @@ All notable, unreleased changes to this project will be documented in this file.
 - Add alt text to `Product` `thumbnail` and `background_image` of `Collection` and `Category` - #3429 by @fowczarek
 - Improve several payment validations - #3418 by @jxltom
 - Fix decimal value argument in GraphQL = #3457 by @fowczarek
-- Add error page if object was not found - #3463 by @dominik-zeglen
+- Add error page if object was not found - #3463 by @dominik-zeglen
+- Bump `urllib3` and `elasticsearch` to latest versions - #3460 by @maarcingebala
diff --git a/Pipfile b/Pipfile
@@ -38,7 +38,7 @@ django-recaptcha = "*"
 django-silk = "==2.0.0"
 django-debug-toolbar = "*"
 django-debug-toolbar-request-history = "*"
-elasticsearch = ">=6.0.0,<6.1.0"
+elasticsearch = "==6.3.1"
 elasticsearch-dsl = ">=6.0.0,<6.1.0"
 faker = ">=0.7.7"
 freezegun = ">=0.3.9"
@@ -63,6 +63,7 @@ weasyprint = ">=0.42.2"
 graphene-django-optimizer = "*"
 braintree = "==3.49.0"
 razorpay = ">=1.1.1"
+"urllib3" = "*"
 
 [dev-packages]
 pytest = "*"