diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-05 16:49:41 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-05 16:49:41 -0800 |
| commit | e0aa5c371ea1c633a0648f13cd7bea35f3aea75c (patch) | |
| tree | a21b09e71748e0e55377b550cd61da509d38169d /app/models/merge_request.rb | |
| parent | 62ed1c537e9b8aa85d354b377f18083fb71b8e05 (diff) | |
| download | gitlab-ce-e0aa5c371ea1c633a0648f13cd7bea35f3aea75c.tar.gz | |
Fix method overlap for issue sorting
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index ad2e8d7879b..f758126cfeb 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -28,6 +28,7 @@ class MergeRequest < ActiveRecord::Base include Issuable include Taskable include InternalId + include Sortable belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project" belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project" |