diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-25 18:28:59 +0300 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-25 18:28:59 +0300 |
| commit | 739cb05228549f6f31f6b5a0c7e66807d5813fcc (patch) | |
| tree | 241947e01c420fde5d39c2a250c132aa2c165c32 /doc/update | |
| parent | 926b2fb73083e0482c14fd29dca6afecd099bb4c (diff) | |
| parent | 7664c76a165e4f151bec3e5f3a25b5eb1f962bb4 (diff) | |
Merge branch 'temporarily-revert-appending-templates-before-long-term-ux-fix' into 'master'
Stop appending templates - Temporary fix
## What does this MR do?
This is the temporary fix for #23315. This stops the templates appending to any existing text.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Temporary fix for #23315.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
See merge request !7050
Diffstat (limited to 'doc/update')
0 files changed, 0 insertions, 0 deletions