summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-04-20 07:35:13 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-04-20 10:57:02 +0100
commit996dd2297ddecbb96f01c672d5a43a85b89a4f00 (patch)
tree5eb18f658db72ed6cddcd364b42ff5b4d98b5f47
parent7a8ce8e36e3e9d32ec0fc8d9dbe05bf52b16651e (diff)
downloadgitlab-ce-996dd2297ddecbb96f01c672d5a43a85b89a4f00.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