gitlab-org--gitlab-foss/app/assets
Fatih Acet 02dd690a2e Merge branch 'append-issue-template' into 'master'
Append issue template to existing description

## What does this MR do?

When selecting an issue template after entering a description, append the template and leave the original content intact.

## Are there points in the code the reviewer needs to double check?

Not that I'm aware of.

## Why was this MR needed?

The issue template shouldn't override the issue content without warning.

## Screenshots

![](https://i.imgur.com/E16X2tc.gif)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master`
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/21733

See merge request !6149
2016-10-04 10:39:21 +00:00
..
fonts
images
javascripts Merge branch 'append-issue-template' into 'master' 2016-10-04 10:39:21 +00:00
stylesheets Merge branch '22006-change-build-wording-to-pipeline-in-mr-block-add-pipeline-id' into 'master' 2016-10-03 22:30:20 +00:00