Commit e84e66be authored by Valery Sizov's avatar Valery Sizov

Merge branch 'negative_approvals' into 'master'

Fix bug with negative approvals required

https://gitlab.com/gitlab-org/gitlab-ee/issues/58

See merge request !72
parents ee1191e8 bf0996cc
v 8.3.0 (unreleased) v 8.3.0 (unreleased)
- License information can now be retrieved via the API - License information can now be retrieved via the API
- Fix bug with negative approvals required
v 8.2.0 v 8.2.0
- Invalidate stored jira password if the endpoint URL is changed - Invalidate stored jira password if the endpoint URL is changed
......
...@@ -444,7 +444,7 @@ class MergeRequest < ActiveRecord::Base ...@@ -444,7 +444,7 @@ class MergeRequest < ActiveRecord::Base
end end
def approved? def approved?
approvals_left.zero? approvals_left < 1
end end
def approved_by?(user) def approved_by?(user)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment