release: merge back stable branch into default

docs/release-notes/release-notes-4.17.3.rst

@@ -0,0 +1,58 b''
+|RCE| 4.17.3 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2019-07-25
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+General
+^^^^^^^
+
+- RSS: use permalinks without slashes for feeds. Fixes #5557. RSS feed will now use
+  links that won't change when a repository is renamed, and in addition they now have
+  better compatibility with Outlook.
+- Pull Requests: make merge state calculation default to disabled.
+  This causes a lot of performance problems and should default to faster way
+- Pull Requests: add indication of state change in list of pull-requests and actually
+  show them in the list. Before PRs that were in states like "merging" were hidden from
+  the PR list. Now we show them with grey-out display indicating PR is changing states.
+- API: extended upload api to be able to upload files with ACL checks enabled
+
+
+Security
+^^^^^^^^
+
+
+
+Performance
+^^^^^^^^^^^
+
+- Pull Requests: don't calculate merge state several times for repo on each pr display object state.
+- Logging: http logging should limit the data to some sane amount.
+  In some cases we could log 100MBs into logs that weren't useful at all.
+
+
+Fixes
+^^^^^
+
+- config: fixed special character in gunicorn config that caused problems during installation.
+- path-filter: enable checking for files access for quick search menu in files view.
+- rcextensions: improved messaging on rcextensions load fail
+- Repository permissions: enable shortcut to set private mode in permission page.
+- UI: fixed style for ancestor commit. Fixes #5558
+- Events: ensure stable execution of integrations (in order: global, per-group, per-repo)
+- Settings: custom header/footer code message correction
+- Artifacts: don't crash when metadata isn't complete. This can be a case for edited upload attachements
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Scheduled release addressing problems in 4.17.X releases.

docs/release-notes/release-notes-4.17.4.rst

@@ -0,0 +1,47 b''
+|RCE| 4.17.4 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2019-10-28
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+General
+^^^^^^^
+
+- Permissions: properly flush user cache permissions in more cases of permission changes.
+  Some API methods and user-group additions didn't invalidate permission caches resulting in
+  users not seeing the permission changes immediately.
+- Pull requests: properly handle exceptions in state change logic, and improve logging on this.
+
+
+Security
+^^^^^^^^
+- Security: fixed XSS in file editing.
+
+
+Performance
+^^^^^^^^^^^
+
+
+
+Fixes
+^^^^^
+
+- Diffs: handle paths with quotes in diffs.
+- Diffs: fixed outdated files in pull-requests re-using the filediff raw_id for anchor generation.
+  This could make rendering diff crash in cases of only having outdated files in a diff.
+- Diffs: handle very odd case of binary, corrupted diffs which crashed the diff parser.
+- Svn: handle non-ascii message editing.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Scheduled release addressing problems in 4.17.X releases.

.hgtags

@@ -55,3 +55,6 b' 5d8057df561c4b6b81b6401aed7d2f911e6e77f7'
 13acfc008896ef4c62546bab5074e8f6f89b4fa7 v4.17.0
 45b9b610976f483877142fe75321808ce9ebac59 v4.17.1
 ad5bd0c4bd322fdbd04bb825a3d027e08f7a3901 v4.17.2
+037f5794b55a6236d68f6485a485372dde6566e0 v4.17.3
+83bc3100cfd6094c1d04f475ddb299b7dc3d0b33 v4.17.4
+e3de8c95baf8cc9109ca56aee8193a2cb6a54c8a v4.17.4

docs/release-notes/release-notes.rst

@@ -9,6 +9,8 b' Release Notes'
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.17.4.rst
+   release-notes-4.17.3.rst
    release-notes-4.17.2.rst
    release-notes-4.17.1.rst
    release-notes-4.17.0.rst