diff options
| author | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-07-26 14:57:43 +0300 |
|---|---|---|
| committer | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-08-30 14:05:40 +0300 |
| commit | c9c2503c5186a38302ed606f793b52ffa394f52c (patch) | |
| tree | f03f46d41d71dcaf71bc867fa4ec949f8dc5931e /app/helpers/merge_requests_helper.rb | |
| parent | 2778dec131c2afac9fcdb2c42365b69099a5ae5b (diff) | |
User can edit closed MR with deleted fork
Add test for closed MR without fork
Add view test visibility of Reopen and Close buttons
Fix controller tests and validation method
Fix missing space
Remove unused variables from test
closed_without_fork? method refactoring
Add information about missing fork
When closed MR without fork can't edit target branch
Tests for closed MR edit view
Fix indentation and rebase, refactoring
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index db6e731c744..a9e175c3f5c 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -98,6 +98,6 @@ module MergeRequestsHelper end def merge_request_button_visibility(merge_request, closed) - return 'hidden' if merge_request.closed? == closed || (merge_request.merged? == closed && !merge_request.closed?) + return 'hidden' if merge_request.closed? == closed || (merge_request.merged? == closed && !merge_request.closed?) || merge_request.closed_without_fork? end end |