diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-02-26 19:02:28 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-02-26 19:02:28 +0300 |
| commit | 13c723f1dd99a6488df0efc89f46cdae1e57126d (patch) | |
| tree | 55d0bb4af6cd99695cc8a5f03d011d027475f7c4 /changelogs | |
| parent | f26cd63b0f7e9acc29a72d81ad2ed327ac93b816 (diff) | |
| parent | f49aeacdd0b20cc270423409efaf82b26ced4836 (diff) | |
Merge branch 'ce-revert-d5ce84fd' into 'master'
Revert "Merge branch 'revert-82d7b5a0-ce' into 'master'"
Closes #57857 and #50747
See merge request gitlab-org/gitlab-ce!25559
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/filter-confidential-issues.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-cpp-templates-404.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/filter-confidential-issues.yml b/changelogs/unreleased/filter-confidential-issues.yml new file mode 100644 index 00000000000..83f19a57aab --- /dev/null +++ b/changelogs/unreleased/filter-confidential-issues.yml @@ -0,0 +1,5 @@ +--- +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 new file mode 100644 index 00000000000..ac958d84099 --- /dev/null +++ b/changelogs/unreleased/sh-fix-cpp-templates-404.yml @@ -0,0 +1,5 @@ +--- +title: Fix 404s when C++ .gitignore template selected +merge_request: 25416 +author: +type: fixed |