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

Fix migration that removes issues.branch_name See merge request gitlab-org/gitlab-ce!15858

Merge branch 'fix-remove-branch-name-migration' into 'master'
70b8aa8d · Sean McGivern · ba731b2a · d47bc70c · 70b8aa8d · 70b8aa8d
Commit 70b8aa8d authored Dec 12, 2017 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

issue.rb app/models/issue.rb +1 -1

20171106154015_remove_issues_branch_name.rb db/post_migrate/20171106154015_remove_issues_branch_name.rb +0 -0

No files found.
--- 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/migrate/20171106154015_remove_issues_branch_name.rb
+++ b/db/migrate/20171106154015_remove_issues_branch_name.rb