Merge remote-tracking branch 'dev/master'

CHANGELOG-EE.md

 Please view this file on the master branch, on stable branches it's out of date.
 
+## 8.15.4 (2017-01-09)
+
+- No changes.
+
 ## 8.15.3 (2017-01-06)
 
 - Disable LDAP permission override in project members edit list.
@@ -25,6 +29,10 @@ Please view this file on the master branch, on stable branches it's out of date.
 - Geo: Enables nodes to be removed even without proper license. !978
 - Update validates_hostname to 1.0.6 to fix a bug in parsing hexadecimal-looking domain names. !982
 
+## 8.14.6 (2017-01-10)
+
+- No changes.
+
 ## 8.14.5 (2016-12-14)
 
 - Add milestone total weight to the milestone summary.
@@ -57,6 +65,10 @@ Please view this file on the master branch, on stable branches it's out of date.
 - Convert ASCII-8BIT LDAP DNs to UTF-8 to avoid unnecessary user deletions
 - [Fix] Only owner can see "Projects" button in group edit menu
 
+## 8.13.11 (2017-01-10)
+
+- No changes.
+
 ## 8.13.10 (2016-12-14)
 
 - No changes.

CHANGELOG.md

@@ -2,6 +2,16 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 8.15.4 (2017-01-09)
+
+- Make successful pipeline emails off for watchers. !8176
+- Speed up group milestone index by passing group_id to IssuesFinder. !8363
+- Don't instrument 405 Grape calls. !8445
+- Update the gitlab-markup gem to the version 1.5.1. !8509
+- Updated Turbolinks to mitigate potential XSS attacks.
+- Re-order update steps in the 8.14 -> 8.15 upgrade guide.
+- Re-add Google Cloud Storage as a backup strategy.
+
 ## 8.15.3 (2017-01-06)
 
 - Rename wiki_events to wiki_page_events in project hooks API to avoid errors. !0 (8425)
@@ -255,6 +265,11 @@ entry.
 - Whitelist next project names: help, ci, admin, search. !8227
 - Adds back CSS for progress-bars. !8237
 
+## 8.14.6 (2017-01-10)
+
+- Update the gitlab-markup gem to the version 1.5.1. !8509
+- Updated Turbolinks to mitigate potential XSS attacks.
+
 ## 8.14.5 (2016-12-14)
 
 - Moved Leave Project and Leave Group buttons to access_request_buttons from the settings dropdown. !7600
@@ -532,6 +547,11 @@ entry.
 - Fix "Without projects" filter. !6611 (Ben Bodenmiller)
 - Fix 404 when visit /projects page
 
+## 8.13.11 (2017-01-10)
+
+- Update the gitlab-markup gem to the version 1.5.1. !8509
+- Updated Turbolinks to mitigate potential XSS attacks.
+
 ## 8.13.10 (2016-12-14)
 
 - API: Memoize the current_user so that sudo can work properly. !8017