Commit 22d5be98 authored by Oswaldo Ferreira's avatar Oswaldo Ferreira

Move locked_at removal to post-deployment migration

parent df53c2a1
......@@ -9,6 +9,7 @@ class MergeRequest < ActiveRecord::Base
include CreatedAtFilterable
ignore_column :position
ignore_column :locked_at
include ::EE::MergeRequest
......
......@@ -6,6 +6,6 @@ class RemoveLockedAtColumnFromMergeRequests < ActiveRecord::Migration
end
def down
add_column :merge_requests, :locked_at, :datetime_with_timezone
# nothing to do to recover the values
end
end
......@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20170803130232) do
ActiveRecord::Schema.define(version: 20170807160457) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment