diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-09 16:07:05 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-09 16:07:05 +0000 |
| commit | 2c050dfe313b730a445d04b827d202279319c449 (patch) | |
| tree | dd2822726b1e40482b0f9f7d39ebd02a50d2d691 /lib/api/api.rb | |
| parent | 2b3a1da6f3ceb4c78c055f14dfe93dbe818366d3 (diff) | |
| parent | 599817a3ceacb00b4258f67df8d1000f1e6dff4a (diff) | |
| download | gitlab-ce-2c050dfe313b730a445d04b827d202279319c449.tar.gz | |
Merge branch 'github-avoid-conflicts-with-admin-labels' into 'master'
Avoid conflict with Admin labels when importing GitHub labels
If the GitHub project have duplicated labels from the Admin labels, the importer will use the Admin label.
Fixes #21319
See merge request !6158
Diffstat (limited to 'lib/api/api.rb')
0 files changed, 0 insertions, 0 deletions