summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2017-12-11 18:06:53 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2017-12-11 18:06:53 +0100
commitd47bc70c102147ac6c3c6909fb903e1e962b0de7 (patch)
tree39e86e1043037887de8c256519ee124bb995a7d2
parentbd8b6518855bd9768ca5d245467b5ff0934e40b6 (diff)
downloadgitlab-ce-fix-remove-branch-name-migration.tar.gz
Fix migration that removes issues.branch_namefix-remove-branch-name-migration
-rw-r--r--app/models/issue.rb2
-rw-r--r--db/post_migrate/20171106154015_remove_issues_branch_name.rb (renamed from db/migrate/20171106154015_remove_issues_branch_name.rb)0
2 files changed, 1 insertions, 1 deletions
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/post_migrate/20171106154015_remove_issues_branch_name.rb
index 3d08225c96d..3d08225c96d 100644
--- a/db/migrate/20171106154015_remove_issues_branch_name.rb
+++ b/db/post_migrate/20171106154015_remove_issues_branch_name.rb