summaryrefslogtreecommitdiff
path: root/tmp
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-12 08:13:14 +0000
committerDouwe Maan <douwe@gitlab.com>2018-01-12 08:13:14 +0000
commitd607f16fe5a1ec51eaea5811b5118b1ba48acfbc (patch)
tree167b8ff8f255dfdd7ed7fa82df04fa4053f401ca /tmp
parent897bc0ed78e289b59ad201472122b7440374985d (diff)
parentd4c8d1b7b2ba679c6eb5d55643abd48c621afc85 (diff)
downloadgitlab-ce-d607f16fe5a1ec51eaea5811b5118b1ba48acfbc.tar.gz
Merge branch 'mk-fix-permanent-redirect-validation' into 'master'
Fix Route validation when conflicting permanent redirects exist Closes gitlab-com/support-forum#2883 and #41786 See merge request gitlab-org/gitlab-ce!16397
Diffstat (limited to 'tmp')
0 files changed, 0 insertions, 0 deletions