Merge branch 'fix-remove-branch-name-migration' into 'master'

Fix migration that removes issues.branch_name See merge request gitlab-org/gitlab-ce!15858
2017-12-12 08:38:04 +00:00 · 2017-12-12 08:38:04 +00:00 · 70b8aa8dbb
commit 70b8aa8dbb
parent ba731b2ab2 d47bc70c10
2 changed files with 1 additions and 1 deletions
--- 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
--- a/db/post_migrate/20171106154015_remove_issues_branch_name.rb
+++ b/db/post_migrate/20171106154015_remove_issues_branch_name.rb