diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-23 20:48:51 +0300 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-24 07:16:00 +0300 |
| commit | dae8838057114bb76c73acf050a5053024f724cb (patch) | |
| tree | e0f2ab1c02b08a9c918ef9165099666db05efbdd /lib | |
| parent | b0fe1810c1fa351b9db2214ababc0ae950026ee7 (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 692c909d838..12f1ef35ae2 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 |