Commit 2bb54170 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'acet-group-issue-boards-project-name' into 'master'

IssueBoards: Show project name in group context inside board item and sidebar.

Closes #3239

See merge request gitlab-org/gitlab-ee!3242
parents f147b012 c8b9c7c5
...@@ -158,7 +158,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({ ...@@ -158,7 +158,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({
class="card-number" class="card-number"
v-if="issueId" v-if="issueId"
> >
{{ issueId }} <span v-if="groupId && issue.project">{{issue.project.path}}</span>{{ issueId }}
</span> </span>
</h4> </h4>
<div class="card-assignee"> <div class="card-assignee">
......
...@@ -430,6 +430,7 @@ ...@@ -430,6 +430,7 @@
.card-number { .card-number {
font-size: 12px; font-size: 12px;
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
display: inline-block;
} }
.issue-boards-search { .issue-boards-search {
......
= render "shared/boards/show", board: @board = render "shared/boards/show", board: @board, group: true
- board = local_assigns.fetch(:board, nil) - board = local_assigns.fetch(:board, nil)
- group = local_assigns.fetch(:group, false)
- @no_breadcrumb_container = true - @no_breadcrumb_container = true
- @no_container = true - @no_container = true
- @content_class = "issue-boards-content js-focus-mode-board" - @content_class = "issue-boards-content js-focus-mode-board"
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
":root-path" => "rootPath", ":root-path" => "rootPath",
":board-id" => "boardId", ":board-id" => "boardId",
":key" => "_uid" } ":key" => "_uid" }
= render "shared/boards/components/sidebar" = render "shared/boards/components/sidebar", group: group
- if @project - if @project
%board-add-issues-modal{ "new-issue-path" => new_project_issue_path(@project), %board-add-issues-modal{ "new-issue-path" => new_project_issue_path(@project),
"milestone-path" => milestones_filter_dropdown_path, "milestone-path" => milestones_filter_dropdown_path,
......
...@@ -8,7 +8,9 @@ ...@@ -8,7 +8,9 @@
%strong %strong
{{ issue.title }} {{ issue.title }}
%br/ %br/
%span %span<
- if @group
{{ issue.project && issue.project.path }}
= precede "#" do = precede "#" do
{{ issue.iid }} {{ issue.iid }}
%a.gutter-toggle.pull-right{ role: "button", %a.gutter-toggle.pull-right{ role: "button",
......
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