diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-06-07 20:22:10 -0600 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-06-07 20:22:10 -0600 |
| commit | 17173d189587cf59692c9ff8a14c155118e941c2 (patch) | |
| tree | 089d9313c71ed6eb3f0de1d9049e855d21beed13 | |
| parent | dcf622937bab0ca068603eece410a18c9d1ca25d (diff) | |
| parent | 14e64d29661e5a25242f7c1c65d080facc5b3b8d (diff) | |
| download | gitlab-ce-17173d189587cf59692c9ff8a14c155118e941c2.tar.gz | |
Merge remote-tracking branch 'gl-dev/master'
| -rw-r--r-- | CHANGELOG.md | 48 | ||||
| -rw-r--r-- | changelogs/unreleased/32715-fix-note-padding.yml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/zj-fix-pipeline-etag.yml | 4 |
3 files changed, 48 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e6d8d398a5..e5567dc3b39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,26 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 9.2.5 (2017-06-07) + +- No changes. + +## 9.2.4 (2017-06-02) + +- Fix visibility when referencing snippets. + +## 9.2.3 (2017-05-31) + +- Move uploads from 'public/uploads' to 'public/uploads/system'. +- Escapes html content before appending it to the DOM. +- Restrict API X-Frame-Options to same origin. +- Allow users autocomplete by author_id only for authenticated users. + +## 9.2.2 (2017-05-25) + +- Fix issue where real time pipelines were not cached. !11615 +- Make all notes use equal padding. + ## 9.2.1 (2017-05-23) - Fix placement of note emoji on hover. @@ -207,6 +227,20 @@ entry. - Fix preemptive scroll bar on user activity calendar. - Pipeline chat notifications convert seconds to minutes and hours. +## 9.1.7 (2017-06-07) + +- No changes. + +## 9.1.6 (2017-06-02) + +- Fix visibility when referencing snippets. + +## 9.1.5 (2017-05-31) + +- Move uploads from 'public/uploads' to 'public/uploads/system'. +- Restrict API X-Frame-Options to same origin. +- Allow users autocomplete by author_id only for authenticated users. + ## 9.1.4 (2017-05-12) - Fix error on CI/CD Settings page related to invalid pipeline trigger. !10948 (dosuken123) @@ -505,6 +539,20 @@ entry. - Only send chat notifications for the default branch. - Don't fill in the default kubernetes namespace. +## 9.0.10 (2017-06-07) + +- No changes. + +## 9.0.9 (2017-06-02) + +- Fix visibility when referencing snippets. + +## 9.0.8 (2017-05-31) + +- Move uploads from 'public/uploads' to 'public/uploads/system'. +- Restrict API X-Frame-Options to same origin. +- Allow users autocomplete by author_id only for authenticated users. + ## 9.0.7 (2017-05-05) - Enforce project features when searching blobs and wikis. diff --git a/changelogs/unreleased/32715-fix-note-padding.yml b/changelogs/unreleased/32715-fix-note-padding.yml deleted file mode 100644 index 867ed7eb171..00000000000 --- a/changelogs/unreleased/32715-fix-note-padding.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Make all notes use equal padding -merge_request: -author: diff --git a/changelogs/unreleased/zj-fix-pipeline-etag.yml b/changelogs/unreleased/zj-fix-pipeline-etag.yml deleted file mode 100644 index 03ebef8c575..00000000000 --- a/changelogs/unreleased/zj-fix-pipeline-etag.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Fix issue where real time pipelines were not cached -merge_request: 11615 -author: |