diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-08 04:47:48 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-08-08 04:47:48 +0300 |
| commit | fd40bce9ccad94c3f8fe522a51a771335d95539f (patch) | |
| tree | 0fb76c147480326f17fb77271628c24794255572 /db/post_migrate | |
| parent | 4490af8cf22416f12c8cf2e00f8b7c293be08167 (diff) | |
| parent | a0c22d1edafbd87d59dbf01acd610da97ec87912 (diff) | |
Merge branch '31207-clean-locked-merge-requests' into 'master'
Resolve "Store MergeWorker JID on merge request, and clean up stuck merges"
Closes #31207
See merge request !13207
Diffstat (limited to 'db/post_migrate')
| -rw-r--r-- | db/post_migrate/20170807160457_remove_locked_at_column_from_merge_requests.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/db/post_migrate/20170807160457_remove_locked_at_column_from_merge_requests.rb b/db/post_migrate/20170807160457_remove_locked_at_column_from_merge_requests.rb new file mode 100644 index 00000000000..ea3d1fb3e02 --- /dev/null +++ b/db/post_migrate/20170807160457_remove_locked_at_column_from_merge_requests.rb @@ -0,0 +1,11 @@ +class RemoveLockedAtColumnFromMergeRequests < ActiveRecord::Migration + DOWNTIME = false + + def up + remove_column :merge_requests, :locked_at + end + + def down + add_column :merge_requests, :locked_at, :datetime_with_timezone + end +end |