From d47bc70c102147ac6c3c6909fb903e1e962b0de7 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Mon, 11 Dec 2017 18:06:53 +0100 Subject: Fix migration that removes issues.branch_name --- app/models/issue.rb | 2 +- db/migrate/20171106154015_remove_issues_branch_name.rb | 13 ------------- db/post_migrate/20171106154015_remove_issues_branch_name.rb | 13 +++++++++++++ 3 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 db/migrate/20171106154015_remove_issues_branch_name.rb create mode 100644 db/post_migrate/20171106154015_remove_issues_branch_name.rb diff --git a/app/models/issue.rb b/app/models/issue.rb index bbda848c39d..dc64888b6fc 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -12,7 +12,7 @@ class Issue < ActiveRecord::Base include ThrottledTouch include IgnorableColumn - ignore_column :assignee_id + ignore_column :assignee_id, :branch_name DueDateStruct = Struct.new(:title, :name).freeze NoDueDate = DueDateStruct.new('No Due Date', '0').freeze diff --git a/db/migrate/20171106154015_remove_issues_branch_name.rb b/db/migrate/20171106154015_remove_issues_branch_name.rb deleted file mode 100644 index 3d08225c96d..00000000000 --- a/db/migrate/20171106154015_remove_issues_branch_name.rb +++ /dev/null @@ -1,13 +0,0 @@ -# See http://doc.gitlab.com/ce/development/migration_style_guide.html -# for more information on how to write migrations for GitLab. - -class RemoveIssuesBranchName < ActiveRecord::Migration - include Gitlab::Database::MigrationHelpers - - # Set this constant to true if this migration requires downtime. - DOWNTIME = false - - def change - remove_column :issues, :branch_name, :string - end -end diff --git a/db/post_migrate/20171106154015_remove_issues_branch_name.rb b/db/post_migrate/20171106154015_remove_issues_branch_name.rb new file mode 100644 index 00000000000..3d08225c96d --- /dev/null +++ b/db/post_migrate/20171106154015_remove_issues_branch_name.rb @@ -0,0 +1,13 @@ +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class RemoveIssuesBranchName < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + # Set this constant to true if this migration requires downtime. + DOWNTIME = false + + def change + remove_column :issues, :branch_name, :string + end +end -- cgit v1.2.1