summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-09-05 10:42:49 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-09-07 10:24:48 +0300
commita449124a76c783f619c4b57e0c8380cdb3bb5c4c (patch)
treeeef574ef939b51820da8ad7f50dadf8ecb5e4396
parentaacb4caf7d60508256b7dabd751802d3ed83f3e0 (diff)
downloadgitlab-ce-a449124a76c783f619c4b57e0c8380cdb3bb5c4c.tar.gz
Add changelog entry and documentation for merge request versions compare
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--CHANGELOG1
-rw-r--r--doc/user/project/merge_requests/versions.md6
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 17388615908..8231d9e8413 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -118,6 +118,7 @@ v 8.11.4
- Fix issue boards leak private label names and descriptions
- Fix broken gitlab:backup:restore because of bad permissions on repo storage !6098 (Dirk Hörner)
- Remove gitorious. !5866
+ - Allow compare merge request versions
v 8.11.3
- Allow system info page to handle case where info is unavailable
diff --git a/doc/user/project/merge_requests/versions.md b/doc/user/project/merge_requests/versions.md
index 2b1c5ddd562..a6aa4b47835 100644
--- a/doc/user/project/merge_requests/versions.md
+++ b/doc/user/project/merge_requests/versions.md
@@ -12,6 +12,12 @@ can select an older one from version dropdown.
![Merge Request Versions](img/versions.png)
+You can also compare the merge request version with older one to see what is
+changed since then.
+
+Please note that comments are disabled while viewing outdated merge versions
+or comparing to versions other than base.
+
---
>**Note:**