diff options
| author | Dietrich Stein <dstein@gitlab.com> | 2019-07-17 13:10:23 -0400 |
|---|---|---|
| committer | Dietrich Stein <dstein@gitlab.com> | 2019-07-17 13:10:23 -0400 |
| commit | c6a2c8f673da4e4e32b15a5b563b25b474bcc263 (patch) | |
| tree | 739819c3f9b61b35e0097835ce67fab6dc50e218 /app/models/merge_request.rb | |
| parent | 9bd4025b21f3ba65cde7755457111db799ef6744 (diff) | |
| parent | 2860cfaaff0a435792081b72a5f97de85e0d4f70 (diff) | |
| download | gitlab-ce-ds-charts-whitespace.tar.gz | |
Merge branch 'master' into ds-charts-whitespaceds-charts-whitespace
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" |