diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-16 18:19:41 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-16 18:19:41 +0200 |
| commit | 9f2c992ff1520e35d9b7bc26d603d597bc189618 (patch) | |
| tree | 17af71363c63d99a15c76b1edcbceddc87bfc12d /app/models/environment.rb | |
| parent | 64bb0d37d4ef1f8574355019f198e40bc9b70224 (diff) | |
| parent | 5f42009f8dcc29d559ee415e92c88858e361f063 (diff) | |
| download | gitlab-ce-9f2c992ff1520e35d9b7bc26d603d597bc189618.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch
Diffstat (limited to 'app/models/environment.rb')
| -rw-r--r-- | app/models/environment.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/environment.rb b/app/models/environment.rb index 94815f99e9f..62db7e958ab 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -223,7 +223,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 |