summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-09-08 02:23:49 +0200
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-09-08 16:05:48 +0200
commita2a0060034171e22962129d53cc74fb7bde54476 (patch)
treeb66837fa4a8169a7529d7093a6242d1c445eb1e1 /app/models/merge_request.rb
parent06c1a8a9ae34e2a4fe7b4f4edb58bacfaf6df5c9 (diff)
downloadgitlab-ce-a2a0060034171e22962129d53cc74fb7bde54476.tar.gz
Rename Upvote role to Votes
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 542817b0eea..3376e31b6f7 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -2,7 +2,7 @@ require File.join(Rails.root, "app/models/commit")
class MergeRequest < ActiveRecord::Base
include IssueCommonality
- include Upvote
+ include Votes
BROKEN_DIFF = "--broken-diff"