diff options
| author | Jacopo <beschi.jacopo@gmail.com> | 2018-09-20 16:41:15 +0200 |
|---|---|---|
| committer | Jacopo <beschi.jacopo@gmail.com> | 2018-10-02 16:17:55 +0200 |
| commit | e2056f08f072805a132bf18879749e401d8ad620 (patch) | |
| tree | b6f7011f7df982cb6c70d604beeef3c656250f7a /app/helpers/merge_requests_helper.rb | |
| parent | ba66e0cc9cc26df686ed47d926a3edcde497baa1 (diff) | |
| download | gitlab-ce-e2056f08f072805a132bf18879749e401d8ad620.tar.gz | |
Hides Close MR button on merged MR50161-hide-close-mr-button-when-merged
When a Merge request is merged, shows only the Report abuse menu item
in the dropdown menu instead of showing the close_reopen_report toggle
with an unusable Close button.
The Report abuse is still hidden when the author of the Merge request
is the current_user.
Hides the Reopen button on a closed and locked issue when the
issue.author is not the current_user
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 87af6fb08f0..23d7aa427bb 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -80,7 +80,11 @@ 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?) || merge_request.closed_without_fork? + return 'hidden' if merge_request_button_hidden?(merge_request, closed) + end + + def merge_request_button_hidden?(merge_request, closed) + merge_request.closed? == closed || (merge_request.merged? == closed && !merge_request.closed?) || merge_request.closed_without_fork? end def merge_request_version_path(project, merge_request, merge_request_diff, start_sha = nil) |