diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-16 16:29:35 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-16 16:29:35 +0000 |
commit | c6701d45474acab6a2d687d2e2ffdaac5c0d5491 (patch) | |
tree | 5e18ab8b3e41bed293e4e1748f780c0fad94fd79 /app/models/merge_request.rb | |
parent | 451cbe1f69d65b24568a53ec7aa4a7fba2c46933 (diff) | |
parent | 0520ee44985528d3076df1208bda7c6c7ff8ec79 (diff) | |
download | gitlab-ce-c6701d45474acab6a2d687d2e2ffdaac5c0d5491.tar.gz |
Merge branch 'issue_20900' into 'master'
Remove issuable drag and drop and sorting from milestone view
Closes #20900
See merge request !11950
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index dd155252ad5..8e8eaea3926 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -4,6 +4,9 @@ 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" |