summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-02-15 11:59:55 +0000
committerLin Jen-Shin <godfat@godfat.org>2019-02-15 11:59:55 +0000
commit7aa0be3c4307cb21024328273611ebb6473842fe (patch)
treea22b5100f4e21f8041a042525e85b7c29ca58714 /lib
parent50193341d8d5bfbe0725619119e2f2c4ba5a7288 (diff)
parenta4bb4fbf8f8dce953d05b3916553d0a2fb984bba (diff)
downloadgitlab-ce-7aa0be3c4307cb21024328273611ebb6473842fe.tar.gz
Merge branch 'import-go-to-project-cta-nibble-backend' into 'master'
BE Improve the GitHub and Gitea import feature table interface See merge request gitlab-org/gitlab-ce!24606
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/etag_caching/router.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/gitlab/etag_caching/router.rb b/lib/gitlab/etag_caching/router.rb
index 08e30214b46..0891f79198d 100644
--- a/lib/gitlab/etag_caching/router.rb
+++ b/lib/gitlab/etag_caching/router.rb
@@ -52,6 +52,14 @@ module Gitlab
Gitlab::EtagCaching::Router::Route.new(
%r(^(?!.*(#{RESERVED_WORDS_REGEX})).*/environments\.json\z),
'environments'
+ ),
+ Gitlab::EtagCaching::Router::Route.new(
+ %r(^(?!.*(#{RESERVED_WORDS_REGEX})).*/import/github/realtime_changes\.json\z),
+ 'realtime_changes_import_github'
+ ),
+ Gitlab::EtagCaching::Router::Route.new(
+ %r(^(?!.*(#{RESERVED_WORDS_REGEX})).*/import/gitea/realtime_changes\.json\z),
+ 'realtime_changes_import_gitea'
)
].freeze