summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2017-06-14 12:53:05 -0300
committerFelipe Artur <felipefac@gmail.com>2017-06-14 12:56:46 -0300
commitfd9c85a16f1f4d9ff55437895995f68b55aa760e (patch)
treea83b05b1ed30ddf2226b29ecf30fcc87074e64bf
parentf6ac7ba349f3912aebd85c64b20cbbb9bb03e380 (diff)
downloadgitlab-ce-issue_20900_remove_ignore_columns.tar.gz
Remove ignore column from issues and merge requestsissue_20900_remove_ignore_columns
-rw-r--r--app/models/issue.rb3
-rw-r--r--app/models/merge_request.rb3
2 files changed, 0 insertions, 6 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb
index f0f525aea21..2cede9d284b 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -9,9 +9,6 @@ class Issue < ActiveRecord::Base
include Spammable
include FasterCacheKeys
include RelativePositioning
- include IgnorableColumn
-
- ignore_column :position
DueDateStruct = Struct.new(:title, :name).freeze
NoDueDate = DueDateStruct.new('No Due Date', '0').freeze
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 8e8eaea3926..dd155252ad5 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -4,9 +4,6 @@ class MergeRequest < ActiveRecord::Base
include Noteable
include Referable
include Sortable
- include IgnorableColumn
-
- ignore_column :position
belongs_to :target_project, class_name: "Project"
belongs_to :source_project, class_name: "Project"