diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-06 09:09:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-06 09:09:59 +0300 |
| commit | 2553d13d9064a16e98720b4d25add589b1e43e28 (patch) | |
| tree | 38da9ed96d2ed03914aa4e735602137e1c031551 /app/helpers/issuables_helper.rb | |
| parent | fbf952e17452b9d103522c59698d4806b10463d7 (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 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 045174de25b..dccb89eec79 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -385,6 +385,14 @@ module IssuablesHelper end end + def issuable_squash_option?(issuable, project) + if issuable.persisted? + issuable.squash + else + project.squash_enabled_by_default? + end + end + private def sidebar_gutter_collapsed? |