summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-03-28 09:19:14 +0000
committerSean McGivern <sean@gitlab.com>2019-03-28 09:19:14 +0000
commit1ab4d12aae9897e48df054a7c58944c5c73a2759 (patch)
tree730ecd88e33b6514e4c1ff0020ab3a793c073004 /changelogs
parentfd3f70c3157da3fbf15c40c48c14c3feaaadcf86 (diff)
parent0e831b0b692f2988d3c84fc01a463b08afec05ad (diff)
downloadgitlab-ce-1ab4d12aae9897e48df054a7c58944c5c73a2759.tar.gz
Merge branch '54670-external-diffs-when-outdated' into 'master'
Allow external diffs to be used conditionally Closes #54670 See merge request gitlab-org/gitlab-ce!25432
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/54670-external-diffs-when-outdated.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/54670-external-diffs-when-outdated.yml b/changelogs/unreleased/54670-external-diffs-when-outdated.yml
new file mode 100644
index 00000000000..2a0b9e75cb4
--- /dev/null
+++ b/changelogs/unreleased/54670-external-diffs-when-outdated.yml
@@ -0,0 +1,5 @@
+---
+title: 'Allow external diffs to be used conditionally'
+merge_request: 25432
+author:
+type: added