Move locked_at removal to post-deployment migration

3 files changed, 3 insertions, 2 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index e0c779b4fbc..e83b11f7668 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -8,6 +8,7 @@ class MergeRequest < ActiveRecord::Base
   include CreatedAtFilterable
 
   ignore_column :position
+  ignore_column :locked_at
 
   belongs_to :target_project, class_name: "Project"
   belongs_to :source_project, class_name: "Project"
diff --git a/db/migrate/20170801000000_remove_locked_at_column_from_merge_requests.rb b/db/post_migrate/20170807160457_remove_locked_at_column_from_merge_requests.rb
index ea3d1fb3e02..3949cf8261a 100644
--- a/db/migrate/20170801000000_remove_locked_at_column_from_merge_requests.rb
+++ b/db/post_migrate/20170807160457_remove_locked_at_column_from_merge_requests.rb
@@ -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
diff --git a/db/schema.rb b/db/schema.rb
index 4816e1aefab..9fdf064a225 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -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"