diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-01-10 19:43:55 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-01-10 19:43:55 -0500 |
| commit | cec7b8f9f015e1c86ca2426ad613bcd24c7b7629 (patch) | |
| tree | a6f70eebd0e2e5d543f60730f99c103e90d42aa3 | |
| parent | f700f6e3cf9b6b7a83f4eac077fa79e0c54332e1 (diff) | |
| parent | 292cf847c9d16214b601990b8cba61fb4963c9e6 (diff) | |
| download | gitlab-ce-cec7b8f9f015e1c86ca2426ad613bcd24c7b7629.tar.gz | |
Merge remote-tracking branch 'dev/master'
| -rw-r--r-- | CHANGELOG.md | 20 | ||||
| -rw-r--r-- | changelogs/unreleased/speed-up-group-milestone-index.yml | 4 |
2 files changed, 20 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index aca4bbc1f24..cabfef84b24 100644 --- a/CHANGELOG.md +++ b/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. !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 diff --git a/changelogs/unreleased/speed-up-group-milestone-index.yml b/changelogs/unreleased/speed-up-group-milestone-index.yml deleted file mode 100644 index b5181fa66da..00000000000 --- a/changelogs/unreleased/speed-up-group-milestone-index.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Speed up group milestone index by passing group_id to IssuesFinder -merge_request: 8363 -author: |