diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-07-16 21:13:18 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-07-16 21:13:18 +0000 |
| commit | dbb71847bcb8356fafd8b11832ccaf534e37344e (patch) | |
| tree | 2221d5957f1f24ebf0bcd20b451a87ce10e6537d /app/models/merge_request.rb | |
| parent | ef3f6386421ad382ddf989523c00a4385b4d0431 (diff) | |
| parent | 3d171dc27163274b181fc0481065c681abae3186 (diff) | |
| download | gitlab-ce-dbb71847bcb8356fafd8b11832ccaf534e37344e.tar.gz | |
Merge branch 'dz-remove-old-ignore-column' into 'master'
Remove old ignore_column in AR models
See merge request gitlab-org/gitlab-ce!30725
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index ba57fefd8f1..68e6e48fb7d 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" |