diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-01-07 16:02:40 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-01-07 16:02:40 +0000 |
| commit | df48758c69e5927a45fb70293c18a2ec82995d6c (patch) | |
| tree | e62084717dfe832edbdbd6777c17592626966b0e /app/models/ci | |
| parent | 64ef3bfd6cfb00b8ef361298e83522bcf3e6dea8 (diff) | |
| parent | 92df3a742c05919f73fa64457794b485c93fa614 (diff) | |
| download | gitlab-ce-df48758c69e5927a45fb70293c18a2ec82995d6c.tar.gz | |
Merge branch 'fix/gb/fix-import-export-restoring-associations' into 'master'
Fix restoring associations with import/export
Closes #41646
See merge request gitlab-org/gitlab-ce!16221
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/build.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index d0ee08ab086..6012dbba1b9 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -79,7 +79,7 @@ module Ci before_save :ensure_token before_destroy { unscoped_project } - after_create do |build| + after_create unless: :importing? do |build| run_after_commit { BuildHooksWorker.perform_async(build.id) } end |