summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-04-20 07:35:13 +0000
committerPhil Hughes <me@iamphill.com>2018-04-20 07:35:13 +0000
commit1999ed709363fb9b9f216c1052edbb91bdabcff1 (patch)
treeada7d81d1cfe400fd734af66528221c2d5b72345
parentef55bbd25400349aa9ec35e269f408f94ce5f890 (diff)
parent3854d28713ca4cc20063c8f38a1599c53a171de7 (diff)
downloadgitlab-ce-1999ed709363fb9b9f216c1052edbb91bdabcff1.tar.gz
Merge branch 'issue_45435' into 'master'
Fix issues without links when added from boards new issue modal Closes #45435 See merge request gitlab-org/gitlab-ce!18460
-rw-r--r--app/assets/javascripts/boards/models/list.js2
-rw-r--r--spec/features/boards/new_issue_spec.rb7
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/javascripts/boards/models/list.js b/app/assets/javascripts/boards/models/list.js
index e210d69895e..7144f4190e7 100644
--- a/app/assets/javascripts/boards/models/list.js
+++ b/app/assets/javascripts/boards/models/list.js
@@ -113,6 +113,8 @@ class List {
issue.id = data.id;
issue.iid = data.iid;
issue.project = data.project;
+ issue.path = data.real_path;
+ issue.referencePath = data.reference_path;
if (this.issuesSize > 1) {
const moveBeforeId = this.issues[1].id;
diff --git a/spec/features/boards/new_issue_spec.rb b/spec/features/boards/new_issue_spec.rb
index 6769acb7c9c..e880f0096c1 100644
--- a/spec/features/boards/new_issue_spec.rb
+++ b/spec/features/boards/new_issue_spec.rb
@@ -63,6 +63,13 @@ describe 'Issue Boards new issue', :js do
page.within(first('.board .issue-count-badge-count')) do
expect(page).to have_content('1')
end
+
+ page.within(first('.card')) do
+ issue = project.issues.find_by_title('bug')
+
+ expect(page).to have_content(issue.to_reference)
+ expect(page).to have_link(issue.title, href: issue_path(issue))
+ end
end
it 'shows sidebar when creating new issue' do