diff options
| author | Phil Hughes <me@iamphill.com> | 2016-07-27 10:17:05 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-07-27 10:17:05 +0100 |
| commit | b53ccd112d10416f3dd4a1a661cdd4345ee89d9b (patch) | |
| tree | 193cff11a2c912ae666b592ba2d5f2bc6e31b530 /app/models/discussion.rb | |
| parent | d6b7599df47ebfd368c7c37fa8d5d484ce26e8eb (diff) | |
| download | gitlab-ce-b53ccd112d10416f3dd4a1a661cdd4345ee89d9b.tar.gz | |
Fixed close merge request not hiding
Diffstat (limited to 'app/models/discussion.rb')
| -rw-r--r-- | app/models/discussion.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/discussion.rb b/app/models/discussion.rb index d17a2dc725d..3efa2c0649f 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -76,7 +76,7 @@ class Discussion return false unless resolvable? current_user == self.noteable.author || - can?(current_user, :push_code, self.project) + current_user.can?(:push_code, self.project) end def resolve!(current_user) |