diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-12 00:08:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-12 00:08:51 +0000 |
| commit | 92ab5f89fe0935677ca8b0c78099228f1da192ac (patch) | |
| tree | 4b0afa1911e9d1aaefad658f4fbc8e504f20d5c5 /app/helpers/issues_helper.rb | |
| parent | d5012fff67191be53070d024a89195a666a581ed (diff) | |
| download | gitlab-ce-92ab5f89fe0935677ca8b0c78099228f1da192ac.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/issues_helper.rb')
| -rw-r--r-- | app/helpers/issues_helper.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 98c378db7d3..e82f09a0a97 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -153,7 +153,7 @@ module IssuesHelper issue.moved_from.project.service_desk_enabled? && !issue.project.service_desk_enabled? end - def issue_header_actions_data(project, issuable, current_user, issuable_sidebar) + def issue_header_actions_data(project, issuable, current_user) new_issuable_params = { issue: {}, add_related_issue: issuable.iid } if issuable.incident? new_issuable_params[:issuable_template] = 'incident' @@ -176,8 +176,7 @@ module IssuesHelper report_abuse_path: add_category_abuse_reports_path, reported_user_id: issuable.author.id, reported_from_url: issue_url(issuable), - submit_as_spam_path: mark_as_spam_project_issue_path(project, issuable), - issuable_email_address: issuable_sidebar.nil? ? '' : issuable_sidebar[:create_note_email] + submit_as_spam_path: mark_as_spam_project_issue_path(project, issuable) } end |