summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/etag_caching
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-05 21:09:02 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-05 21:09:02 +0000
commit76623c12c136f43f24c3966ed4b469e2c0b434b7 (patch)
tree7c5ec884c25e03e4fea131a4d112a9d0ccfd59b8 /spec/lib/gitlab/etag_caching
parentb042382bbf5a4977c5b5c6b0a9a33f4e8ca8d16d (diff)
downloadgitlab-ce-76623c12c136f43f24c3966ed4b469e2c0b434b7.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/etag_caching')
-rw-r--r--spec/lib/gitlab/etag_caching/router_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/etag_caching/router_spec.rb b/spec/lib/gitlab/etag_caching/router_spec.rb
index 4cbabb5ad8d..b69e4668d61 100644
--- a/spec/lib/gitlab/etag_caching/router_spec.rb
+++ b/spec/lib/gitlab/etag_caching/router_spec.rb
@@ -59,7 +59,7 @@ describe Gitlab::EtagCaching::Router do
it 'matches commit pipelines endpoint' do
result = described_class.match(
- '/my-group/my-project/commit/aa8260d253a53f73f6c26c734c72fdd600f6e6d4/pipelines.json'
+ '/my-group/my-project/-/commit/aa8260d253a53f73f6c26c734c72fdd600f6e6d4/pipelines.json'
)
expect(result).to be_present