-
- Downloads
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  ## 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
Showing
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- app/assets/javascripts/blob/template_selector.js 11 additions, 3 deletionsapp/assets/javascripts/blob/template_selector.js
- app/assets/javascripts/templates/issuable_template_selector.js.es6 10 additions, 8 deletions...s/javascripts/templates/issuable_template_selector.js.es6
- spec/features/projects/issuable_templates_spec.rb 25 additions, 5 deletionsspec/features/projects/issuable_templates_spec.rb
Loading
Please register or sign in to comment