Merge branch 'fix-elasticsearch-index-with-strict-mapping' into 'master'

elasticsearch: Fix indexing blobs and commits with strict mapping on

See merge request gitlab-org/gitlab-ee!10322

ee/app/models/concerns/elastic/application_search.rb

@@ -145,6 +145,8 @@ module Elastic
 
         ### REPOSITORIES
         indexes :blob do
+          indexes :type, type: :keyword
+
           indexes :id, type: :text,
                        index_options: 'offsets',
                        analyzer: :sha_analyzer
@@ -168,6 +170,8 @@ module Elastic
         end
 
         indexes :commit do
+          indexes :type, type: :keyword
+
           indexes :id, type: :text,
                        index_options: 'offsets',
                        analyzer: :sha_analyzer