diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-27 11:56:21 +0000 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-04-19 11:22:10 +0200 |
| commit | 309d7d91eccb524282cbb8ab1e429acf6457252b (patch) | |
| tree | 165c7e2e330260d73d375ab87857ea89e2679ffd | |
| parent | 472c2e6a99c072ee8f593d64cf117a9d747815f5 (diff) | |
| download | gitlab-ce-309d7d91eccb524282cbb8ab1e429acf6457252b.tar.gz | |
Merge branch '29976-fix-dropping-job_id' into 'master'
Do try to drop it if ci_builds.job_id isn't there
Closes #29976
See merge request !10216
| -rw-r--r-- | db/migrate/20170301205639_remove_unused_ci_tables_and_columns.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/20170301205639_remove_unused_ci_tables_and_columns.rb b/db/migrate/20170301205639_remove_unused_ci_tables_and_columns.rb index 1e2abea5254..69dd15b8b4e 100644 --- a/db/migrate/20170301205639_remove_unused_ci_tables_and_columns.rb +++ b/db/migrate/20170301205639_remove_unused_ci_tables_and_columns.rb @@ -17,7 +17,7 @@ class RemoveUnusedCiTablesAndColumns < ActiveRecord::Migration end remove_column :ci_pipelines, :push_data, :text - remove_column :ci_builds, :job_id, :integer + remove_column :ci_builds, :job_id, :integer if column_exists?(:ci_builds, :job_id) remove_column :ci_builds, :deploy, :boolean end |