summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-08-02 19:26:35 +0000
committerDouwe Maan <douwe@gitlab.com>2016-08-02 19:26:35 +0000
commitf4cb04da7625f437be9477805f3be4c329eae6df (patch)
tree281a17e3142a77f039e000e1213ec634f4516749 /CHANGELOG
parent90c277aa3cd55322d1bfe68ce8e9dd38c1a5c347 (diff)
parente1832914df2eccea1730586b26e759b562e8b7c1 (diff)
downloadgitlab-ce-f4cb04da7625f437be9477805f3be4c329eae6df.tar.gz
Merge branch 'branches-ending-with-json' into 'master'
Allow branch names ending with .json for graph and network page ## What does this MR do? Allow branch names to end with `.json` for graph and network page. ## Why was this MR needed? Displaying branches ending on `.json` in repository view crashes because links to graph and network page can not be determined. ## What are the relevant issue numbers? fixes #20462, #19585 See merge request !5579
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b44627a9a71..2bcbe501fb1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,6 +37,7 @@ v 8.11.0 (unreleased)
- Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration
- Fix search for notes which belongs to deleted objects
- Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)
+ - Allow branch names ending with .json for graph and network page !5579 (winniehell)
- Add the `sprockets-es6` gem
- Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska)
- Profile requests when a header is passed