diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-08-01 11:19:58 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-01 11:19:58 +0000 |
| commit | e91fe7553db6f1e9d286df4941a1847f27a767d5 (patch) | |
| tree | 90020bb85f37ee8af6189749b4f04672f8f43689 /spec/lib/gitlab/markup_helper_spec.rb | |
| parent | f46d5f5813f5c0fe9c88435c8bda9af08447ef16 (diff) | |
| parent | aad0ae71620d8e988faf75587a612b933df00366 (diff) | |
| download | gitlab-ce-e91fe7553db6f1e9d286df4941a1847f27a767d5.tar.gz | |
Merge branch 'fix/labels-milestones-import' into 'master'
Fix Importing labels and milestones associations - Import/Export
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19510 and https://gitlab.com/gitlab-org/gitlab-ce/issues/19447
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [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` (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 !5426
Diffstat (limited to 'spec/lib/gitlab/markup_helper_spec.rb')
0 files changed, 0 insertions, 0 deletions