Commit 5e040296 authored by Markus Koller's avatar Markus Koller

Merge branch '198494-new-related-issue' into 'master'

Prepopulate new issue with link to the parent

See merge request gitlab-org/gitlab!68226
parents 9421b827 d95d1e5d
...@@ -174,7 +174,11 @@ module IssuesHelper ...@@ -174,7 +174,11 @@ module IssuesHelper
end end
def issue_header_actions_data(project, issuable, current_user) def issue_header_actions_data(project, issuable, current_user)
new_issuable_params = ({ issuable_template: 'incident', issue: { issue_type: 'incident' } } if issuable.incident?) new_issuable_params = { issue: { description: _('Related to #%{issue_id}.') % { issue_id: issuable.iid } + "\n\n" } }
if issuable.incident?
new_issuable_params[:issuable_template] = 'incident'
new_issuable_params[:issue][:issue_type] = 'incident'
end
{ {
can_create_issue: show_new_issue_link?(project).to_s, can_create_issue: show_new_issue_link?(project).to_s,
......
...@@ -27665,6 +27665,9 @@ msgstr "" ...@@ -27665,6 +27665,9 @@ msgstr ""
msgid "Related merge requests" msgid "Related merge requests"
msgstr "" msgstr ""
msgid "Related to #%{issue_id}."
msgstr ""
msgid "Relates to" msgid "Relates to"
msgstr "" msgstr ""
......
...@@ -25,7 +25,7 @@ RSpec.describe "User views incident" do ...@@ -25,7 +25,7 @@ RSpec.describe "User views incident" do
it 'shows the merge request and incident actions', :js, :aggregate_failures do it 'shows the merge request and incident actions', :js, :aggregate_failures do
click_button 'Incident actions' click_button 'Incident actions'
expect(page).to have_link('New incident', href: new_project_issue_path(project, { issuable_template: 'incident', issue: { issue_type: 'incident' } })) expect(page).to have_link('New incident', href: new_project_issue_path(project, { issuable_template: 'incident', issue: { issue_type: 'incident', description: "Related to \##{incident.iid}.\n\n" } }))
expect(page).to have_button('Create merge request') expect(page).to have_button('Create merge request')
expect(page).to have_button('Close incident') expect(page).to have_button('Close incident')
end end
......
...@@ -25,7 +25,7 @@ RSpec.describe "User views issue" do ...@@ -25,7 +25,7 @@ RSpec.describe "User views issue" do
it 'shows the merge request and issue actions', :js, :aggregate_failures do it 'shows the merge request and issue actions', :js, :aggregate_failures do
click_button 'Issue actions' click_button 'Issue actions'
expect(page).to have_link('New issue', href: new_project_issue_path(project)) expect(page).to have_link('New issue', href: new_project_issue_path(project, { issue: { description: "Related to \##{issue.iid}.\n\n" } }))
expect(page).to have_button('Create merge request') expect(page).to have_button('Create merge request')
expect(page).to have_button('Close issue') expect(page).to have_button('Close issue')
end end
......
...@@ -284,7 +284,7 @@ RSpec.describe IssuesHelper do ...@@ -284,7 +284,7 @@ RSpec.describe IssuesHelper do
iid: issue.iid, iid: issue.iid,
is_issue_author: 'false', is_issue_author: 'false',
issue_type: 'issue', issue_type: 'issue',
new_issue_path: new_project_issue_path(project), new_issue_path: new_project_issue_path(project, { issue: { description: "Related to \##{issue.iid}.\n\n" } }),
project_path: project.full_path, project_path: project.full_path,
report_abuse_path: new_abuse_report_path(user_id: issue.author.id, ref_url: issue_url(issue)), report_abuse_path: new_abuse_report_path(user_id: issue.author.id, ref_url: issue_url(issue)),
submit_as_spam_path: mark_as_spam_project_issue_path(project, issue) submit_as_spam_path: mark_as_spam_project_issue_path(project, issue)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment