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
..
api	Minor fixes in the Env API endpoints	2016-08-01 08:42:09 +02:00
assets
backup	Fix backup restore	2016-07-25 06:23:07 -07:00
banzai	Merge branch 'ability-batch-issue-checking' into 'master'	2016-07-29 16:54:37 +00:00
ci	Move job dependencies entry to the new CI config	2016-07-20 14:15:18 +02:00
container_registry	Make rubocop happy	2016-07-15 18:05:39 +02:00
gitlab	squashed - fixed label and milestone association problems, updated specs and refactored reader class a bit	2016-08-01 09:57:40 +02:00
json_web_token
omni_auth
rouge/formatters	use %(...) and %[...] in favor of %<...>	2016-07-14 22:43:49 -07:00
support	Defend against 'Host' header injection	2016-07-12 19:50:20 +02:00
tasks	Merge branch 'simple-cov' into 'master'	2016-07-27 16:42:07 +00:00
banzai.rb	Object renderer read_multi rendered entries from Cache	2016-07-12 14:35:29 +02:00
disable_email_interceptor.rb
event_filter.rb
extracts_path.rb
file_size_validator.rb
file_streamer.rb
gitlab.rb
gt_one_coercion.rb
repository_cache.rb	Use project ID in repository cache to prevent stale data from persisting across projects	2016-07-25 05:09:28 -07:00
static_model.rb
unfold_form.rb
uploaded_file.rb
version_check.rb