summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-11-18 14:33:39 +0000
committerAlejandro Rodríguez <alejorro70@gmail.com>2016-11-18 21:58:04 +0000
commit936fb018a2039cf7bed7c31a806c8ea0e4e8a7f3 (patch)
treea8fbf408f3810d0707382f1ac8c9a20e153a3fe1 /db
parent673e76073ea889fa10c66823f1780e745f501182 (diff)
downloadgitlab-ce-936fb018a2039cf7bed7c31a806c8ea0e4e8a7f3.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')
-rw-r--r--db/migrate/20161020083353_add_pipeline_id_to_merge_request_metrics.rb2
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