Merge branch 'master' into 'ce-to-ee'

# Conflicts:
#   app/models/repository.rb

app/models/repository.rb

@@ -1369,4 +1369,4 @@ class Repository
   def repository_event(event, tags = {})
     Gitlab::Metrics.add_event(event, { path: path_with_namespace }.merge(tags))
   end
-end
+end
\ No newline at end of file