diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-12 08:38:04 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-12 08:38:04 +0000 |
| commit | 70b8aa8dbb6b449e24add797a8efc50618e73ab1 (patch) | |
| tree | cb40d5d2359c18c282efa2e88a2f1bc1b0e8a868 | |
| parent | ba731b2ab2426745486f87bde006fa59c4bfcdd8 (diff) | |
| parent | d47bc70c102147ac6c3c6909fb903e1e962b0de7 (diff) | |
| download | gitlab-ce-70b8aa8dbb6b449e24add797a8efc50618e73ab1.tar.gz | |
Merge branch 'fix-remove-branch-name-migration' into 'master'
Fix migration that removes issues.branch_name
See merge request gitlab-org/gitlab-ce!15858
| -rw-r--r-- | app/models/issue.rb | 2 | ||||
| -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 162b6bafab4..162b6bafab4 100644 --- a/db/migrate/20171106154015_remove_issues_branch_name.rb +++ b/db/post_migrate/20171106154015_remove_issues_branch_name.rb |