# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2018-09-18 17:46:43
# Node ID fa345ee9b5dec45440a8107daabbcbb3111c523d
# Parent  abc4ebe87963f4398dffa71cc5cec5e320757019
# Parent  da3361d848f2b6077ccbf0bc5f6fadc2d6a5c170

release: merge back stable branch into default

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -42,3 +42,4 @@ 7fc0731b024c3114be87865eda7ab621cc957e32
 6d531c0b068c6eda62dddceedc9f845ecb6feb6f v4.12.4
 3d6bf2d81b1564830eb5e83396110d2a9a93eb1e v4.13.0
 5468fc89e708bd90e413cd0d54350017abbdbc0e v4.13.1
+610d621550521c314ee97b3d43473ac0bcf06fb8 v4.13.2
diff --git a/docs/release-notes/release-notes-4.13.2.rst b/docs/release-notes/release-notes-4.13.2.rst
new file mode 100644
--- /dev/null
+++ b/docs/release-notes/release-notes-4.13.2.rst
@@ -0,0 +1,51 @@
+|RCE| 4.13.2 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2018-08-18
+
+
+New Features
+^^^^^^^^^^^^
+
+- audit-logs: add audit logs for branch permissions.
+
+
+General
+^^^^^^^
+
+- svn: properly handle credentials from URL during remote repository import.
+- svn: use more detailed logs/errors so `exception_tracker` can show it with details.
+- svn: use streaming uploads/downloads of files.
+- svn: use shared configurable storage for svn_txn_id interception logic.
+- celery: use `exception_tracker` to store tasks exceptions for easier debugging.
+
+
+Security
+^^^^^^^^
+
+
+
+Performance
+^^^^^^^^^^^
+
+
+
+Fixes
+^^^^^
+
+- exception_tracker: use a default value of exception store that is working across
+  all instances e.g vcsserver and enterprise. This fixed problem with usage in
+  cluster type setup.
+- Comments: fixed problem with audit-logs receiving a empty value in certain
+  conditions resulting in 500 error on commenting.
+- Branch Permissions: during creation of rule add special check for existing entries to
+  prevent duplicates if two users edit branch permissions at the same time.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Scheduled release addressing reported problems, and improving stability.
diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst
--- a/docs/release-notes/release-notes.rst
+++ b/docs/release-notes/release-notes.rst
@@ -9,6 +9,7 @@ Release Notes
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.13.2.rst
    release-notes-4.13.1.rst
    release-notes-4.13.0.rst
    release-notes-4.12.4.rst