Merge branch 'fix-tags-for-envs' into 'master'

Fix tags for environments

Closes gitlab-ee#8397

See merge request gitlab-org/gitlab-ce!22993

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