Commit ac8c136e authored by Sean McGivern's avatar Sean McGivern

Merge branch 'issue_20900_remove_ignore_columns' into 'master'

Issue 20900 remove ignore columns

See merge request !12166
parents b4c201a2 998833df
...@@ -9,11 +9,8 @@ class Issue < ActiveRecord::Base ...@@ -9,11 +9,8 @@ class Issue < ActiveRecord::Base
include Spammable include Spammable
include FasterCacheKeys include FasterCacheKeys
include RelativePositioning include RelativePositioning
include IgnorableColumn
include CreatedAtFilterable include CreatedAtFilterable
ignore_column :position
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
AnyDueDate = DueDateStruct.new('Any Due Date', '').freeze AnyDueDate = DueDateStruct.new('Any Due Date', '').freeze
......
...@@ -7,7 +7,6 @@ class MergeRequest < ActiveRecord::Base ...@@ -7,7 +7,6 @@ class MergeRequest < ActiveRecord::Base
include IgnorableColumn include IgnorableColumn
include CreatedAtFilterable include CreatedAtFilterable
ignore_column :position
ignore_column :locked_at ignore_column :locked_at
belongs_to :target_project, class_name: "Project" belongs_to :target_project, class_name: "Project"
......
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