diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-11-18 14:33:39 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-11-18 14:33:39 +0000 |
| commit | 50b95f31396e37900e4f3176a746bb668e10745c (patch) | |
| tree | 0a2bab3be6178a90ce2367a88191532b7e6fc297 /db/migrate | |
| parent | 64db51b1a8e99f202c606c957036f7abada54f56 (diff) | |
| parent | 0a6d3533b1adb62fe09d45b8f59483204ab122c8 (diff) | |
| download | gitlab-ce-50b95f31396e37900e4f3176a746bb668e10745c.tar.gz | |
Merge branch 'fix/pipeline-id-metrics-migration' into 'master'
Fix migration missing ignored transaction method
Adds missing `disable_ddl_transaction!` to migration
See merge request !7569
Diffstat (limited to 'db/migrate')
| -rw-r--r-- | db/migrate/20161020083353_add_pipeline_id_to_merge_request_metrics.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/db/migrate/20161020083353_add_pipeline_id_to_merge_request_metrics.rb b/db/migrate/20161020083353_add_pipeline_id_to_merge_request_metrics.rb index ed53756cd24..f49df6802a7 100644 --- a/db/migrate/20161020083353_add_pipeline_id_to_merge_request_metrics.rb +++ b/db/migrate/20161020083353_add_pipeline_id_to_merge_request_metrics.rb @@ -4,6 +4,8 @@ class AddPipelineIdToMergeRequestMetrics < ActiveRecord::Migration include Gitlab::Database::MigrationHelpers + disable_ddl_transaction! + # Set this constant to true if this migration requires downtime. DOWNTIME = true |