diff options
| author | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-10-19 14:49:09 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-10-20 14:17:22 +0200 |
| commit | c1212beaa495b5b0c3b805bb1b2a7bdc6d1a941b (patch) | |
| tree | 5a99eca6e6047a13ab71159a6c16ae50ba78b382 /app/models | |
| parent | ba2d5b16028e0b8430f7297372a9b82fbd006fd7 (diff) | |
| download | gitlab-ce-c1212beaa495b5b0c3b805bb1b2a7bdc6d1a941b.tar.gz | |
Use deployment IID when saving refs
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/deployment.rb | 2 | ||||
| -rw-r--r-- | app/models/environment.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/deployment.rb b/app/models/deployment.rb index 1f8c5fb3d85..c843903877b 100644 --- a/app/models/deployment.rb +++ b/app/models/deployment.rb @@ -102,6 +102,6 @@ class Deployment < ActiveRecord::Base private def ref_path - File.join(environment.ref_path, 'deployments', id.to_s) + File.join(environment.ref_path, 'deployments', iid.to_s) end end diff --git a/app/models/environment.rb b/app/models/environment.rb index d575f1dc73a..73f415c0ef0 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -71,8 +71,8 @@ class Environment < ActiveRecord::Base return nil unless ref - deployment_id = ref.split('/').last - deployments.find(deployment_id) + deployment_iid = ref.split('/').last + deployments.find_by(iid: deployment_iid) end def ref_path |