diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-16 20:29:45 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-16 20:34:02 +0300 |
| commit | 4053a4046ebb032cc1938307fef4403def82a94d (patch) | |
| tree | c17e0df1269a2c9a48c9969dd4a6a1d23a8fa4f1 /VERSION | |
| parent | 7610a11d7bc33a5afecd782bf1d323e9aa25ee56 (diff) | |
Merge branch 'template_dropdown' into 'master'
Implements TemplateDropdown class to create custom template dropdowns
## What does this MR do?
Refactorize template dropdowns. This MR creates a base TemplateSelector class so it can be reused for multiple types of templates.
## Does this MR meet the acceptance criteria?
- [ ] [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
- [ ] Added for this feature/bug
- [x] All builds are passing
- [ ] 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` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4697
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions