Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
d53805c2
Commit
d53805c2
authored
6 years ago
by
Constance Okoghenun
Committed by
Fatih Acet
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Extract EE specific files/lines for app/views/shared/boards/components"
parent
7ffadfff
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
app/views/shared/boards/components/_board.html.haml
app/views/shared/boards/components/_board.html.haml
+3
-3
app/views/shared/boards/components/_sidebar.html.haml
app/views/shared/boards/components/_sidebar.html.haml
+3
-0
No files found.
app/views/shared/boards/components/_board.html.haml
View file @
d53805c2
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
"v-if"
=>
"!list.preset && list.id"
}
"v-if"
=>
"!list.preset && list.id"
}
%button
.board-delete.has-tooltip.float-right
{
type:
"button"
,
title:
_
(
"Delete list"
),
"aria-label"
=>
_
(
"Delete list"
),
data:
{
placement:
"bottom"
},
"@click.stop"
=>
"deleteBoard"
}
%button
.board-delete.has-tooltip.float-right
{
type:
"button"
,
title:
_
(
"Delete list"
),
"aria-label"
=>
_
(
"Delete list"
),
data:
{
placement:
"bottom"
},
"@click.stop"
=>
"deleteBoard"
}
=
icon
(
"trash"
)
=
icon
(
"trash"
)
.issue-count-badge.clearfix
{
"v-if"
=>
'list.type !== "blank"'
}
.issue-count-badge.clearfix
{
"v-if"
=>
'list.type !== "blank"
&& list.type !== "promotion"
'
}
%span
.issue-count-badge-count.float-left
{
":class"
=>
'
{
"has-btn"
:
list
.
type
!==
"closed"
&&
!
disabled
}
'
}
%span
.issue-count-badge-count.float-left
{
":class"
=>
'
{
"has-btn"
:
list
.
type
!==
"closed"
&&
!
disabled
}
'
}
{{ list.issuesSize }}
{{ list.issuesSize }}
-
if
can?
(
current_user
,
:admin_list
,
current_board_parent
)
-
if
can?
(
current_user
,
:admin_list
,
current_board_parent
)
...
@@ -43,8 +43,7 @@
...
@@ -43,8 +43,7 @@
"title"
=>
_
(
"New issue"
),
"title"
=>
_
(
"New issue"
),
data:
{
placement:
"top"
,
container:
"body"
}
}
data:
{
placement:
"top"
,
container:
"body"
}
}
=
icon
(
"plus"
,
class:
"js-no-trigger-collapse"
)
=
icon
(
"plus"
,
class:
"js-no-trigger-collapse"
)
%board-list
{
"v-if"
=>
'list.type !== "blank" && list.type !== "promotion"'
,
%board-list
{
"v-if"
=>
'list.type !== "blank"'
,
":list"
=>
"list"
,
":list"
=>
"list"
,
":issues"
=>
"list.issues"
,
":issues"
=>
"list.issues"
,
":loading"
=>
"list.loading"
,
":loading"
=>
"list.loading"
,
...
@@ -55,3 +54,4 @@
...
@@ -55,3 +54,4 @@
"ref"
=>
"board-list"
}
"ref"
=>
"board-list"
}
-
if
can?
(
current_user
,
:admin_list
,
current_board_parent
)
-
if
can?
(
current_user
,
:admin_list
,
current_board_parent
)
%board-blank-state
{
"v-if"
=>
'list.id == "blank"'
}
%board-blank-state
{
"v-if"
=>
'list.id == "blank"'
}
=
render_if_exists
'shared/boards/board_promotion_state'
This diff is collapsed.
Click to expand it.
app/views/shared/boards/components/_sidebar.html.haml
View file @
d53805c2
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
{{ issue.title }}
{{ issue.title }}
%br
/
%br
/
%span
%span
=
render_if_exists
"shared/boards/components/sidebar/issue_project_path"
=
precede
"#"
do
=
precede
"#"
do
{{ issue.iid }}
{{ issue.iid }}
%a
.gutter-toggle.float-right
{
role:
"button"
,
%a
.gutter-toggle.float-right
{
role:
"button"
,
...
@@ -17,9 +18,11 @@
...
@@ -17,9 +18,11 @@
=
custom_icon
(
"icon_close"
,
size:
15
)
=
custom_icon
(
"icon_close"
,
size:
15
)
.js-issuable-update
.js-issuable-update
=
render
"shared/boards/components/sidebar/assignee"
=
render
"shared/boards/components/sidebar/assignee"
=
render_if_exists
"shared/boards/components/sidebar/epic"
=
render
"shared/boards/components/sidebar/milestone"
=
render
"shared/boards/components/sidebar/milestone"
=
render
"shared/boards/components/sidebar/due_date"
=
render
"shared/boards/components/sidebar/due_date"
=
render
"shared/boards/components/sidebar/labels"
=
render
"shared/boards/components/sidebar/labels"
=
render_if_exists
"shared/boards/components/sidebar/weight"
=
render
"shared/boards/components/sidebar/notifications"
=
render
"shared/boards/components/sidebar/notifications"
%remove-btn
{
":issue"
=>
"issue"
,
%remove-btn
{
":issue"
=>
"issue"
,
":issue-update"
=>
"issue.sidebarInfoEndpoint"
,
":issue-update"
=>
"issue.sidebarInfoEndpoint"
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment