summaryrefslogtreecommitdiffstats
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorJohan Sørensen <johan@johansorensen.com>2009-11-17 15:52:24 +0100
committerJohan Sørensen <johan@johansorensen.com>2009-11-19 15:42:28 +0100
commitee93e51e3a433995168384a244276e8c5175e5ba (patch)
tree44c7639b9456802031c489446ff1321afc6817db /app/models/merge_request.rb
parent4d78be19d4717df31b0960acf0df8eeacd7ca303 (diff)
downloadgitorious-mainline-outdated-ee93e51e3a433995168384a244276e8c5175e5ba.zip
gitorious-mainline-outdated-ee93e51e3a433995168384a244276e8c5175e5ba.tar.gz
gitorious-mainline-outdated-ee93e51e3a433995168384a244276e8c5175e5ba.tar.bz2
MergeRequest#resolvable_by? should use the committerships with a review bit
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 85d00aa..5bf69ff 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -252,7 +252,7 @@ class MergeRequest < ActiveRecord::Base
def resolvable_by?(candidate)
return false unless candidate.is_a?(User)
- (candidate === user) || candidate.can_write_to?(target_repository)
+ (candidate === user) || target_repository.reviewers.include?(candidate)
end
def commits_for_selection