Merge branch '337894-fix-etag-caching-regex-for-environments' into 'master'

Resolve "Fix ETag caching regex for environments"

See merge request gitlab-org/gitlab!67708

lib/gitlab/etag_caching/router/restful.rb

@@ -71,7 +71,7 @@ module Gitlab
             'continuous_delivery'
           ],
           [
-            %r(#{RESERVED_WORDS_PREFIX}/environments\.json\z),
+            %r(#{RESERVED_WORDS_PREFIX}/-/environments\.json\z),
             'environments',
             'continuous_delivery'
           ],

spec/lib/gitlab/etag_caching/router/restful_spec.rb

@@ -87,12 +87,18 @@ RSpec.describe Gitlab::EtagCaching::Router::Restful do
   end
 
   it 'matches the environments path' do
-    result = match_route('/my-group/my-project/environments.json')
+    result = match_route('/my-group/my-project/-/environments.json')
 
     expect(result).to be_present
     expect(result.name).to eq 'environments'
   end
 
+  it 'does not match the operations environments list path' do
+    result = match_route('/-/operations/environments.json')
+
+    expect(result).not_to be_present
+  end
+
   it 'matches pipeline#show endpoint' do
     result = match_route('/my-group/my-project/-/pipelines/2.json')