Merge branch...

Merge branch '4632-move-ee-specific-models-and-serializers-to-ee-app-models-serializers-directory' into 'master' Resolve "Move EE-specific models and serializers to `ee/app/{models,serializers}` directory" Closes #4632 See merge request gitlab-org/gitlab-ee!4131

Merge branch...
Merge branch '4632-move-ee-specific-models-and-serializers-to-ee-app-models-serializers-directory' into 'master' Resolve "Move EE-specific models and serializers to `ee/app/{models,serializers}` directory" Closes #4632 See merge request gitlab-org/gitlab-ee!4131
b21cbc52 · Nick Thomas · b6d78e9c · 4eaebc28 · b21cbc52 · b21cbc52
Commit b21cbc52 authored Jan 18, 2018 by Nick Thomas
3 changed files
--- a/app/models/storage_shard.rb
+++ b/app/models/storage_shard.rb
--- a/app/serializers/deploy_keys_project_entity.rb
+++ b/app/serializers/deploy_keys_project_entity.rb
--- a/app/serializers/namespace_entity.rb
+++ b/app/serializers/namespace_entity.rb