summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-30 16:47:35 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-30 16:47:35 +0000
commit6d22e9674456b921e0f951af10ba18505891ec10 (patch)
tree73471555eecb8de6b3fb2e520e171aaaddee4e7b /CHANGELOG
parenta06354485ccbb9c31f7111327a82caf446a81a5f (diff)
parent72a7febeada2c58c98caee8bb7ce18886a7c0868 (diff)
downloadgitlab-ce-6d22e9674456b921e0f951af10ba18505891ec10.tar.gz
Merge branch 'fix-submodule-error-with-forked-project' into 'master'
Fix "Revspec not found" errors when viewing diffs in a forked project with submodules ## What does this MR do? This MR fixes an error that occurs when viewing diffs in a forked project with submodules. ### Are there points in the code the reviewer needs to double check? Testing this code was tricky. The only way this problem shows up is if the origin project does NOT have the submodule update commit. The introduction of gitlab-test-fork serves that purpose: it contains a submodule update not present in gitlab-test. ### Why was this MR needed? A user would receive a 500 error when trying to view a merge request with a submodule update. #1413 has details on how to reproduce this issue. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1413 See merge request !512
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 305d2c2508e..3af83ddc256 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 7.11.0 (unreleased)
- Fix "Cannot move project" error message from popping up after a successful transfer (Stan Hu)
- Redirect to sign in page after signing out.
- Fix "Hello @username." references not working by no longer allowing usernames to end in period.
+ - Fix "Revspec not found" errors when viewing diffs in a forked project with submodules (Stan Hu)
-
- Fix broken file browsing with relative submodule in personal projects (Stan Hu)
- Add "Reply quoting selected text" shortcut key (`r`)