summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2019-07-15 09:26:18 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2019-07-15 09:38:57 +0300
commit3d171dc27163274b181fc0481065c681abae3186 (patch)
tree3935bd306b083d206e3b2e7f0414a9fa8a46b44e /app/models/merge_request.rb
parent283361f53760d90ee7bd605e11033d8999957dfb (diff)
downloadgitlab-ce-3d171dc27163274b181fc0481065c681abae3186.tar.gz
Remove old ignore_column in AR modelsdz-remove-old-ignore-column
Next models are affected: * Project * Namespace * Issue * Merge request * CI Trigger * CI Pipeline schedule Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 53977748c30..34dca665852 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -7,7 +7,6 @@ class MergeRequest < ApplicationRecord
include Noteable
include Referable
include Presentable
- include IgnorableColumn
include TimeTrackable
include ManualInverseAssociation
include EachBatch
@@ -24,10 +23,6 @@ class MergeRequest < ApplicationRecord
SORTING_PREFERENCE_FIELD = :merge_requests_sort
- ignore_column :locked_at,
- :ref_fetched,
- :deleted_at
-
belongs_to :target_project, class_name: "Project"
belongs_to :source_project, class_name: "Project"
belongs_to :merge_user, class_name: "User"