summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-11-12 19:35:20 +0100
committerKamil Trzciński <ayufan@ayufan.eu>2018-11-12 19:35:40 +0100
commitdb9ecc76178e0a4e800e885bf04624dd79168b78 (patch)
treed3d3a42723ca1f6994db7517c7236d94175185a5
parentb45a7cc012637733db8865235619f70ef8cb143a (diff)
downloadgitlab-ce-db9ecc76178e0a4e800e885bf04624dd79168b78.tar.gz
Do not reload self on hooks when creating deploymentfix-tags-for-envs
-rw-r--r--app/models/concerns/deployable.rb4
-rw-r--r--changelogs/unreleased/fix-tags-for-envs.yml5
2 files changed, 6 insertions, 3 deletions
diff --git a/app/models/concerns/deployable.rb b/app/models/concerns/deployable.rb
index f4f1989f0a9..a1bec950665 100644
--- a/app/models/concerns/deployable.rb
+++ b/app/models/concerns/deployable.rb
@@ -21,9 +21,7 @@ module Deployable
sha: sha,
user: user,
deployable: self,
- on_stop: on_stop).tap do |_|
- self.reload # Reload relationships
- end
+ on_stop: on_stop)
end
end
end
diff --git a/changelogs/unreleased/fix-tags-for-envs.yml b/changelogs/unreleased/fix-tags-for-envs.yml
new file mode 100644
index 00000000000..633788ff6d8
--- /dev/null
+++ b/changelogs/unreleased/fix-tags-for-envs.yml
@@ -0,0 +1,5 @@
+---
+title: Do not reload self on hooks when creating deployment
+merge_request:
+author:
+type: fixed