diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-12-13 12:28:45 -0200 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-12-13 12:29:29 -0200 |
| commit | a0d03d5401d9569ad621202c992f3cc878050c08 (patch) | |
| tree | aff381e1b85e125196dedbea16783c084ca68a97 | |
| parent | 46cde339a2c4d8fcb86d2b0eca1dca02583d3d76 (diff) | |
| download | gitlab-ce-a0d03d5401d9569ad621202c992f3cc878050c08.tar.gz | |
Fix wrong conflict resolution on !15858
| -rw-r--r-- | app/models/issue.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index dc64888b6fc..2dedfc348fb 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -9,10 +9,9 @@ class Issue < ActiveRecord::Base include FasterCacheKeys include RelativePositioning include TimeTrackable - include ThrottledTouch include IgnorableColumn - ignore_column :assignee_id, :branch_name + ignore_column :branch_name DueDateStruct = Struct.new(:title, :name).freeze NoDueDate = DueDateStruct.new('No Due Date', '0').freeze |