diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-02-26 04:01:58 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-02-26 04:01:58 +0300 |
commit | 4a5b3707798c2dde62dd78c40b8f0393b38c8041 (patch) | |
tree | 1f73d09424cb5ca929a3cde97cc873e997369f86 /changelogs | |
parent | 44cc030574593dc72514f22b453eb966751b9b78 (diff) | |
parent | cae2c336819d1838507b0c5d21c609710b21ac4f (diff) |
Merge branch 'revert-82d7b5a0-ce' into 'master'
[CE port] Revert "Automatic merge of gitlab-org/gitlab-ce master"
See merge request gitlab-org/gitlab-ce!25537
Diffstat (limited to 'changelogs')
-rw-r--r-- | changelogs/unreleased/api-issuable-bulk-update.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/filter-confidential-issues.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/sh-fix-cpp-templates-404.yml | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/changelogs/unreleased/api-issuable-bulk-update.yml b/changelogs/unreleased/api-issuable-bulk-update.yml deleted file mode 100644 index 3d4e96f9d1b..00000000000 --- a/changelogs/unreleased/api-issuable-bulk-update.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 'API: Bulk update for issues and MRs' -merge_request: 25201 -author: Robert Schilling -type: added diff --git a/changelogs/unreleased/filter-confidential-issues.yml b/changelogs/unreleased/filter-confidential-issues.yml deleted file mode 100644 index 83f19a57aab..00000000000 --- a/changelogs/unreleased/filter-confidential-issues.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Ability to filter confidential issues -merge_request: 24960 -author: Robert Schilling -type: added diff --git a/changelogs/unreleased/sh-fix-cpp-templates-404.yml b/changelogs/unreleased/sh-fix-cpp-templates-404.yml deleted file mode 100644 index ac958d84099..00000000000 --- a/changelogs/unreleased/sh-fix-cpp-templates-404.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix 404s when C++ .gitignore template selected -merge_request: 25416 -author: -type: fixed |