summaryrefslogtreecommitdiff
path: root/doc/gitlab-basics/add-merge-request.md
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-02-04 16:12:47 +0000
committerDouwe Maan <douwe@gitlab.com>2016-02-04 16:12:47 +0000
commitac923b4fb40da88d6c7907d08d4584d5d4a560e2 (patch)
tree79050d2d630b681d1ed97448e497be87c4905328 /doc/gitlab-basics/add-merge-request.md
parentdfe12649f64bcac76b270a96be04285bbe0c2aa2 (diff)
parent5dc77d7577bf19586f6cd756678d0c2660e7f868 (diff)
downloadgitlab-ce-ac923b4fb40da88d6c7907d08d4584d5d4a560e2.tar.gz
Merge branch 'fix/atom-url-issue' into 'master'
Fix atom url issue on projects This MR adds prevents a project to have a path ending in .atom that conflicts with the feed and Adds a migration to migrate old .atom projects to a different path Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699 See merge request !2651
Diffstat (limited to 'doc/gitlab-basics/add-merge-request.md')
0 files changed, 0 insertions, 0 deletions