Inject EE specific modules using EE::Project

This ensures that Project only includes a single prepend for
EE::Project, which in turn takes care of the rest.

app/models/ee/project.rb

@@ -8,6 +8,9 @@ module EE
 
     prepended do
       include IgnorableColumn
+      include Elastic::ProjectsSearch
+      prepend GeoAwareAvatar
+      prepend ImportStatusStateMachine
 
       ignore_column :sync_time
 

app/models/project.rb

@@ -19,10 +19,7 @@ class Project < ActiveRecord::Base
   include Routable
 
   # EE specific modules
-  include Elastic::ProjectsSearch
-  prepend EE::GeoAwareAvatar
   prepend EE::Project
-  prepend EE::Project::ImportStatusStateMachine
 
   extend Gitlab::ConfigHelper