From 6ca02a41500790b3e9061dd8836540955b9aaf7c Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz@gitlab.com>
Date: Tue, 5 Dec 2017 14:31:33 +0000
Subject: Merge branch 'zj-multiple-artifacts-ee' into 'master'

Multiple artifacts ee

See merge request gitlab-org/gitlab-ee!3276
---
 db/migrate/20170918072949_add_file_store_job_artifacts.rb | 14 ++++++++++++++
 db/schema.rb                                              |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 db/migrate/20170918072949_add_file_store_job_artifacts.rb

(limited to 'db')

diff --git a/db/migrate/20170918072949_add_file_store_job_artifacts.rb b/db/migrate/20170918072949_add_file_store_job_artifacts.rb
new file mode 100644
index 00000000000..8c265bb6aca
--- /dev/null
+++ b/db/migrate/20170918072949_add_file_store_job_artifacts.rb
@@ -0,0 +1,14 @@
+class AddFileStoreJobArtifacts < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+  DOWNTIME = false
+
+  def up
+    add_column(:ci_job_artifacts, :file_store, :integer)
+  end
+
+  def down
+    remove_column(:ci_job_artifacts, :file_store)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8846bbd975c..8aa6a87657e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -326,6 +326,7 @@ ActiveRecord::Schema.define(version: 20171205190711) do
     t.integer "project_id", null: false
     t.integer "job_id", null: false
     t.integer "file_type", null: false
+    t.integer "file_store"
     t.integer "size", limit: 8
     t.datetime_with_timezone "created_at", null: false
     t.datetime_with_timezone "updated_at", null: false
-- 
cgit v1.2.1