diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-23 20:48:51 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-23 20:48:51 +0300 |
| commit | 536f74ff1e9a2b7e5723cf5d866e7cb9d650a877 (patch) | |
| tree | ab2af715fe1137fe272fd8ba83f61de300cbd36f /lib | |
| parent | d07e85e1033f8026f155c6171cb3ebcd6b93d9ed (diff) | |
| parent | b518cd867f731298762f51ef15375c00f11c441d (diff) | |
Merge branch 'zj-fix-pipeline-etag' into 'master'
Fix pipeline etag
Closes #32658
See merge request !11615
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/etag_caching/router.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/etag_caching/router.rb b/lib/gitlab/etag_caching/router.rb index ba31041d0c1..bdf885559c5 100644 --- a/lib/gitlab/etag_caching/router.rb +++ b/lib/gitlab/etag_caching/router.rb @@ -38,7 +38,7 @@ module Gitlab 'project_pipelines' ), Gitlab::EtagCaching::Router::Route.new( - %r(^(?!.*(#{RESERVED_WORDS})).*/pipelines/\d+\.json\z), + %r(^(?!.*(#{RESERVED_WORDS_REGEX})).*/pipelines/\d+\.json\z), 'project_pipeline' ) ].freeze |