summaryrefslogtreecommitdiff
path: root/db/migrate/20151028152939_add_merge_when_build_succeeds_to_merge_request.rb
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-11-02 17:27:38 +0100
committerZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-11-02 17:27:38 +0100
commit77f8a1e392b64f51326df8aebdc77e97af07bfed (patch)
treef1ce42885c2459c9e4737d8a8b5099fbdc2efa7b /db/migrate/20151028152939_add_merge_when_build_succeeds_to_merge_request.rb
parent8c9e1df98eb45e3305ab5badc6727580e84d36e0 (diff)
downloadgitlab-ce-77f8a1e392b64f51326df8aebdc77e97af07bfed.tar.gz
Merge when build succeeds
Diffstat (limited to 'db/migrate/20151028152939_add_merge_when_build_succeeds_to_merge_request.rb')
-rw-r--r--db/migrate/20151028152939_add_merge_when_build_succeeds_to_merge_request.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/db/migrate/20151028152939_add_merge_when_build_succeeds_to_merge_request.rb b/db/migrate/20151028152939_add_merge_when_build_succeeds_to_merge_request.rb
new file mode 100644
index 00000000000..ceb52f0c222
--- /dev/null
+++ b/db/migrate/20151028152939_add_merge_when_build_succeeds_to_merge_request.rb
@@ -0,0 +1,7 @@
+class AddMergeWhenBuildSucceedsToMergeRequest < ActiveRecord::Migration
+ def change
+ add_column :merge_requests, :merge_params, :text
+ add_column :merge_requests, :merge_when_build_succeeds, :boolean, default: false, null: false
+ add_column :merge_requests, :merge_user_id, :integer
+ end
+end