Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into es_repo_indexer_stable

CHANGELOG-EE

@@ -8,6 +8,7 @@ v 8.4.4
   - Re-introduce "Send email to users" link in Admin area
   - Fix category values for Jenkins and JenkinsDeprecated services
   - Make elastic indexer more stable
+  - Fix Elasticsearch indexing for newly added snippets
 
 v 8.4.3
   - Elasticsearch: fix partial blob indexing on push

app/models/personal_snippet.rb

@@ -16,4 +16,8 @@
 #
 
 class PersonalSnippet < Snippet
+  # Elastic search configuration (it does not support STI)
+  document_type 'snippet'
+  index_name [Rails.application.class.parent_name.downcase, 'snippet', Rails.env].join('-')
+  include Elastic::SnippetsSearch
 end

app/models/project_snippet.rb

@@ -16,6 +16,11 @@
 #
 
 class ProjectSnippet < Snippet
+  # Elastic search configuration (it does not support STI)
+  document_type 'snippet'
+  index_name [Rails.application.class.parent_name.downcase, 'snippet', Rails.env].join('-')
+  include Elastic::SnippetsSearch
+
   belongs_to :project
   belongs_to :author, class_name: "User"