summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2017-08-07 16:34:57 -0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2017-08-07 16:46:30 -0300
commit16cffa97f64f55a16a50cf861e133021f31c828f (patch)
tree11ea0ed90591a07479045fd024ac60280813cc32 /db
parent0640b3d1d89b7a4eda343eb23b0518a835ac9106 (diff)
downloadgitlab-ce-16cffa97f64f55a16a50cf861e133021f31c828f.tar.gz
Move locked_at removal to post-deployment migration
Diffstat (limited to 'db')
-rw-r--r--db/post_migrate/20170807160457_remove_locked_at_column_from_merge_requests.rb (renamed from db/migrate/20170801000000_remove_locked_at_column_from_merge_requests.rb)2
-rw-r--r--db/schema.rb2
2 files changed, 2 insertions, 2 deletions
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"