Fix etag route misses

Fixes gitlab-org/gitlab-ce#33106

Fix etag route misses
Fixes gitlab-org/gitlab-ce#33106
f20949a3 · Z.J. van de Weg · 6b3f6c9f · f20949a3 · f20949a3
Commit f20949a3 authored Jun 12, 2017 by Z.J. van de Weg
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

app/models/environment.rb app/models/environment.rb +2 -1

lib/gitlab/etag_caching/store.rb lib/gitlab/etag_caching/store.rb +2 -2

No files found.
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -209,7 +209,8 @@ class Environment < ActiveRecord::Base
  def etag_cache_key
    Gitlab::Routing.url_helpers.namespace_project_environments_path(
      project.namespace,
-      project)
+      project,
+      format: :json)
  end

  private

--- a/lib/gitlab/etag_caching/store.rb
+++ b/lib/gitlab/etag_caching/store.rb
@@ -25,7 +25,7 @@ module Gitlab
      end

      def redis_key(key)
-        raise 'Invalid key' unless Gitlab::EtagCaching::Router.match(key)
+        raise 'Invalid key' if !Rails.env.production? && !Gitlab::EtagCaching::Router.match(key)

        "#{REDIS_NAMESPACE}#{key}"
      end