summaryrefslogtreecommitdiff
path: root/db/migrate
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-10-01 09:31:48 +0300
committerValery Sizov <vsv2711@gmail.com>2015-10-01 09:45:47 +0300
commit05fdd12fd984ffee0b2c9be3821fbc9a67abc6d4 (patch)
treea9b553865771a2199996c587b38abdc4da9a71ef /db/migrate
parent2714d5b8147cef39343a1c35ba099ebe6445f5e4 (diff)
downloadgitlab-ce-05fdd12fd984ffee0b2c9be3821fbc9a67abc6d4.tar.gz
Improve error message when merging failsmr_improve_errors_handling
Diffstat (limited to 'db/migrate')
-rw-r--r--db/migrate/20150930001110_merge_request_error_field.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/db/migrate/20150930001110_merge_request_error_field.rb b/db/migrate/20150930001110_merge_request_error_field.rb
new file mode 100644
index 00000000000..c2ee498ef3f
--- /dev/null
+++ b/db/migrate/20150930001110_merge_request_error_field.rb
@@ -0,0 +1,5 @@
+class MergeRequestErrorField < ActiveRecord::Migration
+ def up
+ add_column :merge_requests, :merge_error, :string
+ end
+end