diff options
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 052e0850d96..b6ea85f6507 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -20,11 +20,10 @@ # require Rails.root.join("app/models/commit") -require Rails.root.join("app/roles/static_model") +require Rails.root.join("lib/static_model") class MergeRequest < ActiveRecord::Base - include IssueCommonality - include Votes + include Issuable attr_accessible :title, :assignee_id, :closed, :target_branch, :source_branch, :milestone_id, :author_id_of_changes |