Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers/issuables_helper.rb')
-rw-r--r--app/helpers/issuables_helper.rb17
1 files changed, 8 insertions, 9 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index a848c814742..dccb89eec79 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -367,15 +367,6 @@ module IssuablesHelper
end
end
- def issuable_close_reopen_button_method(issuable)
- case issuable
- when Issue
- ''
- when MergeRequest
- 'put'
- end
- end
-
def issuable_author_is_current_user(issuable)
issuable.author == current_user
end
@@ -394,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?