summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-08-10 14:16:31 +0000
committerPhil Hughes <me@iamphill.com>2018-08-10 14:16:31 +0000
commit9964b678110e97c492a8b2f77ab899252c05f10e (patch)
treee3fe2f6858801caf332c3dc6f60d301c9194fc6f /changelogs
parentf1ae7c669bcbaea41698d293f974c0e9462bf9a4 (diff)
parent03351199dfa793631f352201d2dba15162789ec1 (diff)
downloadgitlab-ce-9964b678110e97c492a8b2f77ab899252c05f10e.tar.gz
Merge branch 'fl-reduce-ee-conflicts-reports-code' into 'master'
Reduce differences between CE and EE code base in reports components See merge request gitlab-org/gitlab-ce!21128
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/fl-reduce-ee-conflicts-reports-code.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/fl-reduce-ee-conflicts-reports-code.yml b/changelogs/unreleased/fl-reduce-ee-conflicts-reports-code.yml
new file mode 100644
index 00000000000..068681dfe19
--- /dev/null
+++ b/changelogs/unreleased/fl-reduce-ee-conflicts-reports-code.yml
@@ -0,0 +1,5 @@
+---
+title: Reduce differences between CE and EE code base in reports components
+merge_request:
+author:
+type: other