diff options
| -rw-r--r-- | app/models/issue.rb | 2 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 2 | ||||
| -rw-r--r-- | app/roles/votes.rb (renamed from app/roles/upvote.rb) | 2 | ||||
| -rw-r--r-- | spec/models/issue_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/merge_request_spec.rb | 2 | ||||
| -rw-r--r-- | spec/roles/votes_spec.rb (renamed from spec/roles/upvote_spec.rb) | 0 |
6 files changed, 5 insertions, 5 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 6409eebac63..96a54907ca3 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -1,6 +1,6 @@ class Issue < ActiveRecord::Base include IssueCommonality - include Upvote + include Votes acts_as_taggable_on :labels 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" diff --git a/app/roles/upvote.rb b/app/roles/votes.rb index 7efa6f20cfc..2940929298e 100644 --- a/app/roles/upvote.rb +++ b/app/roles/votes.rb @@ -1,4 +1,4 @@ -module Upvote +module Votes # Return the number of +1 comments (upvotes) def upvotes notes.select(&:upvote?).size diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb index ca6307e72b1..34192da94ad 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -12,7 +12,7 @@ describe Issue do describe 'modules' do it { should include_module(IssueCommonality) } - it { should include_module(Upvote) } + it { should include_module(Votes) } end subject { Factory.create(:issue) } diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index d1253b35ae5..523e823de34 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -8,6 +8,6 @@ describe MergeRequest do describe 'modules' do it { should include_module(IssueCommonality) } - it { should include_module(Upvote) } + it { should include_module(Votes) } end end diff --git a/spec/roles/upvote_spec.rb b/spec/roles/votes_spec.rb index 24288ada0fe..24288ada0fe 100644 --- a/spec/roles/upvote_spec.rb +++ b/spec/roles/votes_spec.rb |