diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-10 10:20:03 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-10 10:20:03 +0000 |
| commit | 58db2929f713c90a9b66b27b5a2fc46d6a0dbf94 (patch) | |
| tree | f85f7d657b4716df1abbbbdc35b1540270ea3875 /app | |
| parent | bb02141e417ff21deb7707a806a313545bbdd5af (diff) | |
| parent | b74677489a915570a182e624fc2c7ad537c8e75e (diff) | |
| download | gitlab-ce-58db2929f713c90a9b66b27b5a2fc46d6a0dbf94.tar.gz | |
Merge branch '24139-production-wildcard-for-cycle-analytics' into 'master'
Treat environments matching `production/*` as Production for Cycle Analytics
Closes #24139
See merge request !8500
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/environment.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/environment.rb b/app/models/environment.rb index 5cde94b3509..652abf18a8a 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -87,7 +87,7 @@ class Environment < ActiveRecord::Base end def update_merge_request_metrics? - self.name == "production" + (environment_type || name) == "production" end def first_deployment_for(commit) |