diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-17 15:09:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-17 15:09:37 +0300 |
| commit | c6283014fe69dc6699b00abedff607bd5c5718b0 (patch) | |
| tree | b54f2096e09cd8b2e0985a416947cda515d82fbf /app/helpers/issuables_helper.rb | |
| parent | afed1a4be18c74f8b95a0b8e0e359a1339ca1ad1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/issuables_helper.rb')
| -rw-r--r-- | app/helpers/issuables_helper.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index b255597b18d..c85f2ceb82e 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -386,6 +386,12 @@ module IssuablesHelper end end + def reviewer_sidebar_data(reviewer, merge_request: nil) + { avatar_url: reviewer.avatar_url, name: reviewer.name, username: reviewer.username }.tap do |data| + data[:can_merge] = merge_request.can_be_merged_by?(reviewer) if merge_request + end + end + def issuable_squash_option?(issuable, project) if issuable.persisted? issuable.squash |