From fa27773d168636be41df5e6710fc4343607ca4bf Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Mon, 23 Apr 2018 16:26:32 +0100
Subject: [PATCH] Release note for #4462

---
 CHANGELOG.txt                     | 1 +
 CONTRIBUTORS.rst                  | 1 +
 docs/advanced_topics/settings.rst | 2 ++
 docs/releases/2.1.rst             | 6 ++++++
 4 files changed, 10 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 606656aca4..7f3df7d6a7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,6 +5,7 @@ Changelog
 ~~~~~~~~~~~~~~~~
 
  * Add `HelpPanel` to add HTML within an edit form (Keving Chung)
+ * Added direct profile picture upload to account preferences (Daniel Chimeno, Pierre Geier, Matt Westcott)
  * Added API endpoint for finding pages by HTML path (Karl Hobley)
  * Added time zone setting to account preferences (David Moore)
  * Persist tab hash in URL to allow direct navigation to tabs in the admin interface (Ben Weatherman)
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 4a09d426ae..3fb4f43264 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -297,6 +297,7 @@ Contributors
 * Sergey Fedoseev
 * Harm Zeinstra
 * David Moore
+* Pierre Geier
 
 Translators
 ===========
diff --git a/docs/advanced_topics/settings.rst b/docs/advanced_topics/settings.rst
index fb0674b2ac..f5a9db19cb 100644
--- a/docs/advanced_topics/settings.rst
+++ b/docs/advanced_topics/settings.rst
@@ -231,6 +231,8 @@ This setting lets you change the number of items shown at 'Your most recent edit
 Allows the default ``LoginForm`` to be extended with extra fields.
 
 
+.. _wagtail_gravatar_provider_url:
+
 .. code-block:: python
 
   WAGTAIL_GRAVATAR_PROVIDER_URL = '//www.gravatar.com/avatar'
diff --git a/docs/releases/2.1.rst b/docs/releases/2.1.rst
index 87a962701f..970c8e1acb 100644
--- a/docs/releases/2.1.rst
+++ b/docs/releases/2.1.rst
@@ -17,6 +17,12 @@ A new panel type ``HelpPanel`` allows to easily add HTML within an edit form.
 This new feature was developed by Kevin Chung.
 
 
+Profile picture upload
+~~~~~~~~~~~~~~~~~~~~~~
+
+Users can now upload profile pictures directly through the Account Settings menu, rather than using Gravatar. Gravatar is still used as a fallback if no profile picture has been uploaded directly; a new setting :ref:`WAGTAIL_GRAVATAR_PROVIDER_URL <wagtail_gravatar_provider_url>` has been added to specify an alternative provider, or disable the use of external avatars completely. This feature was developed by Daniel Chimeno, Pierre Geier and Matt Westcott.
+
+
 API lookup by page path
 ~~~~~~~~~~~~~~~~~~~~~~~