diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-14 23:45:50 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-14 23:45:50 +0300 |
commit | aea75cfb0ac7b373bacdee17ee9e8c1314c3b676 (patch) | |
tree | 2495d81e8002a3eff11e4f01dc55fb23886d7486 /spec/tasks | |
parent | 19e0dafbef47ca04f19d38b72b817beeb09e8510 (diff) | |
parent | d7f357a386162f645ba5a8550dfa1d3b22d0ff2c (diff) |
Merge branch 'fix-mr-notes' into 'master'
Use pre-wrap for diff code in discussion view
This prevents merge request comments from being hidden in discussion view. See #2017.
### Before
![diff_comment_before](https://dev.gitlab.org/Okada/gitlabhq/uploads/e6d24987b8d88f4e8a5883645d569b56/diff_comment_before.png)
### After
![diff_comment_after](https://dev.gitlab.org/Okada/gitlabhq/uploads/fc035f9fc44718dc8424d3f8b54f0953/diff_comment_after.png)
This change doesn't affect the "Changes" tab:
![diff_view_comment](https://dev.gitlab.org/Okada/gitlabhq/uploads/9975d4c3feac629d6a0d76b5a0ef43d8/diff_view_comment.png)
cc @sytse
See merge request !1700
Diffstat (limited to 'spec/tasks')
0 files changed, 0 insertions, 0 deletions