summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-03 09:06:07 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-03 09:06:07 +0200
commitda03a5c7e25601c2bce8375dbbe1cffc58db7bbf (patch)
treef64f9a9d4c396839b99a263a4c46014db4fa7f4d /app/models/merge_request.rb
parent40a956eb6825f2bbca06e9f24c1fb24dc71a1ecd (diff)
downloadgitlab-ce-da03a5c7e25601c2bce8375dbbe1cffc58db7bbf.tar.gz
more refactoring using models/concerns
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 68211acc0c2..b6ea85f6507 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -23,8 +23,7 @@ require Rails.root.join("app/models/commit")
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