Skip to content

G
gitlab-ce
Commit 70b8aa8d authored by Sean McGivern's avatar Sean McGivern
Browse files
Options

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

Fix migration that removes issues.branch_name

See merge request gitlab-org/gitlab-ce!15858
parents ba731b2a d47bc70c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
app/models/issue.rb
View file @ 70b8aa8d
...@@ -12,7 +12,7 @@ class Issue < ActiveRecord::Base ...@@ -12,7 +12,7 @@ class Issue < ActiveRecord::Base
include ThrottledTouch include ThrottledTouch
include IgnorableColumn include IgnorableColumn
ignore_column :assignee_id ignore_column :assignee_id, :branch_name
DueDateStruct = Struct.new(:title, :name).freeze DueDateStruct = Struct.new(:title, :name).freeze
NoDueDate = DueDateStruct.new('No Due Date', '0').freeze NoDueDate = DueDateStruct.new('No Due Date', '0').freeze
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7