diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-29 10:58:21 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-29 10:58:21 +0000 |
| commit | 8230b774b5a6375d9b84c71e72c8e41e3bfd7fad (patch) | |
| tree | 151480556851e0c9b3fd233eb8e9bb0459d7ee6e /lib | |
| parent | 8b37ce6f7f6d29604c42c65f3986d60dce0abd6c (diff) | |
| parent | d756150dcf9d078c9bc27316b0ce7937df427266 (diff) | |
| download | gitlab-ce-8230b774b5a6375d9b84c71e72c8e41e3bfd7fad.tar.gz | |
Merge branch 'fix/gb/fix-background-pipeline-stages-migration' into 'master'
Fix background pipeline stages migration
Closes #44135
See merge request gitlab-org/gitlab-ce!18076
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/background_migration/migrate_build_stage.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/background_migration/migrate_build_stage.rb b/lib/gitlab/background_migration/migrate_build_stage.rb index 8fe4f1a2289..242e3143e71 100644 --- a/lib/gitlab/background_migration/migrate_build_stage.rb +++ b/lib/gitlab/background_migration/migrate_build_stage.rb @@ -12,6 +12,7 @@ module Gitlab class Build < ActiveRecord::Base self.table_name = 'ci_builds' + self.inheritance_column = :_type_disabled def ensure_stage!(attempts: 2) find_stage || create_stage! |