diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-21 13:09:19 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-21 13:09:19 +0300 |
| commit | ac8c136e2cca6d0ce68429450bddb1d6c19818fe (patch) | |
| tree | 434bbb12d597ced9ddbb65028cc9d9b904e4b0e7 | |
| parent | b4c201a29f7265d23d90e4115e209bca2c0d8e72 (diff) | |
| parent | 998833dfdcf15a1e63f342efa6cba24bb370c610 (diff) | |
Merge branch 'issue_20900_remove_ignore_columns' into 'master'
Issue 20900 remove ignore columns
See merge request !12166
| -rw-r--r-- | app/models/issue.rb | 3 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 1c948c8957e..043da9967a1 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -9,11 +9,8 @@ class Issue < ActiveRecord::Base include Spammable include FasterCacheKeys include RelativePositioning - include IgnorableColumn include CreatedAtFilterable - ignore_column :position - DueDateStruct = Struct.new(:title, :name).freeze NoDueDate = DueDateStruct.new('No Due Date', '0').freeze AnyDueDate = DueDateStruct.new('Any Due Date', '').freeze diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index ac08dc0ee1f..f028d2395c1 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -7,7 +7,6 @@ class MergeRequest < ActiveRecord::Base include IgnorableColumn include CreatedAtFilterable - ignore_column :position ignore_column :locked_at belongs_to :target_project, class_name: "Project" |