summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-02-10 21:53:41 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-02-10 21:53:41 +0000
commit9bcc9ec14cf4f120b8e16d5c232f82e1fc5e2cfd (patch)
tree6ebbaa158b9bf2c71f0046d14eddd07729f62ddd /CHANGELOG
parent42607a7f175ead8494b12f1c94734eb3b6a16ca1 (diff)
parentc1541fdf1ebe15cd6321b0f27337bbcc17891ac8 (diff)
downloadgitlab-ce-9bcc9ec14cf4f120b8e16d5c232f82e1fc5e2cfd.tar.gz
Merge branch 'display-mr-link-if-thre-is-one' into 'master'
Replaces "Create merge request" link with one to the MR when one exists Fixes #3716 * Without MR: ![before-1](/uploads/abcb2eb5bb5927a83c2f1700528f852c/before-1.png) * With MR: ![after-1](/uploads/9020b871e1aa08d3e5a45359336ef0f2/after-1.png) * Without MR: ![before-2](/uploads/bb3bd1a74efc193ad31af68f1e04ef5f/before-2.png) * With MR: ![after-2](/uploads/789d32aef12f39c605e665d0c4bc9fbe/after-2.png) * Without MR: ![before-3](/uploads/a9aff7a11eb1069be24c37a5455be809/before-3.png) * With MR: ![after-3](/uploads/48fe81ea50657fe5b2de0d25260d8e4b/after-3.png) See merge request !2670
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6aca5ce48cd..ceb5c17cae9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -47,6 +47,7 @@ v 8.5.0 (unreleased)
- Faster snippet search
- Title for milestones should be unique (Zeger-Jan van de Weg)
- Validate correctness of maximum attachment size application setting
+ - Replaces "Create merge request" link with one to the "Merge Request" when one exists
v 8.4.4
- Update omniauth-saml gem to 1.4.2