Rémy Coutable e91fe7553d 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		2016-08-01 11:19:58 +00:00
..
assets	Implement final review comments from @rymai.	2016-07-29 15:20:39 +05:30
controllers	Merge branch 'zj-env-external-url' into 'master'	2016-08-01 09:04:09 +00:00
finders	implements the basic filter functionality	2016-07-19 19:30:10 +01:00
helpers	Improve diff performance by eliminating redundant checks for text blobs	2016-07-29 21:06:50 -07:00
mailers	Allow build email service to be tested	2016-07-15 20:38:27 -03:00
models	Merge branch 'fix/labels-milestones-import' into 'master'	2016-08-01 11:19:58 +00:00
services	Properly abort a merge when merge conflicts occur	2016-07-29 11:21:21 -07:00
uploaders	Remove magic comments from Ruby files (!5456)	2016-07-24 07:08:45 +02:00
validators	refactor url validator to use sanitizer for check	2016-07-01 09:02:45 +02:00
views	Merge branch 'zj-env-external-url' into 'master'	2016-08-01 09:04:09 +00:00
workers	Merge remote-tracking branch 'upstream/master' into new-issue-by-email	2016-07-27 18:11:50 +08:00