diff options
author | Stan Hu <stanhu@gmail.com> | 2018-11-12 23:14:14 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-11-12 23:14:14 +0300 |
commit | 8f60a8ba8d2e518088194483233582b80fc1a5d7 (patch) | |
tree | 2167fda11473912041f94b517060cf76a0e7f39e /app/models | |
parent | 33cd8efbd7db768057ae87b97566733a6eed7997 (diff) | |
parent | 08ef7b9fe8595ab6695418108420f079dbd73694 (diff) |
Merge branch 'fix-tags-for-envs' into 'master'
Fix tags for environments
Closes gitlab-ee#8397
See merge request gitlab-org/gitlab-ce!22993
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/concerns/deployable.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/models/concerns/deployable.rb b/app/models/concerns/deployable.rb index f4f1989f0a9..85db01af18d 100644 --- a/app/models/concerns/deployable.rb +++ b/app/models/concerns/deployable.rb @@ -13,17 +13,14 @@ module Deployable name: expanded_environment_name ) - environment.deployments.create!( + create_deployment!( project_id: environment.project_id, environment: environment, ref: ref, tag: tag, sha: sha, user: user, - deployable: self, - on_stop: on_stop).tap do |_| - self.reload # Reload relationships - end + on_stop: on_stop) end end end |