From b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 13 Sep 2019 13:26:31 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 lib/gitlab/etag_caching/router.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/gitlab/etag_caching')

diff --git a/lib/gitlab/etag_caching/router.rb b/lib/gitlab/etag_caching/router.rb
index d09dcdbb337..7b921ab6199 100644
--- a/lib/gitlab/etag_caching/router.rb
+++ b/lib/gitlab/etag_caching/router.rb
@@ -3,6 +3,8 @@
 module Gitlab
   module EtagCaching
     class Router
+      prepend_if_ee('EE::Gitlab::EtagCaching::Router') # rubocop: disable Cop/InjectEnterpriseEditionModule
+
       Route = Struct.new(:regexp, :name)
       # We enable an ETag for every request matching the regex.
       # To match a regex the path needs to match the following:
-- 
cgit v1.2.3