BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
c5160c11
Commit
c5160c11
authored
Mar 06, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ce-3727-fe-labels-for-epics' into 'master'
CE Port: Add `js-` classes in LabelsSelect component See merge request gitlab-org/gitlab-ce!17558
parents
2d00d6d4
2169da03
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
base.vue
...ipts/vue_shared/components/sidebar/labels_select/base.vue
+2
-2
dropdown_value.vue
...hared/components/sidebar/labels_select/dropdown_value.vue
+1
-1
index.html.haml
app/views/groups/labels/index.html.haml
+4
-2
No files found.
app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue
View file @
c5160c11
...
@@ -88,7 +88,7 @@ export default {
...
@@ -88,7 +88,7 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div
class=
"block labels"
>
<div
class=
"block labels
js-labels-block
"
>
<dropdown-value-collapsed
<dropdown-value-collapsed
v-if=
"showCreate"
v-if=
"showCreate"
:labels=
"context.labels"
:labels=
"context.labels"
...
@@ -104,7 +104,7 @@ export default {
...
@@ -104,7 +104,7 @@ export default {
</dropdown-value>
</dropdown-value>
<div
<div
v-if=
"canEdit"
v-if=
"canEdit"
class=
"selectbox"
class=
"selectbox
js-selectbox
"
style=
"display: none;"
style=
"display: none;"
>
>
<dropdown-hidden-input
<dropdown-hidden-input
...
...
app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue
View file @
c5160c11
...
@@ -35,7 +35,7 @@ export default {
...
@@ -35,7 +35,7 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div
class=
"hide-collapsed value issuable-show-labels"
>
<div
class=
"hide-collapsed value issuable-show-labels
js-value
"
>
<span
<span
v-if=
"isEmpty"
v-if=
"isEmpty"
class=
"text-secondary"
class=
"text-secondary"
...
...
app/views/groups/labels/index.html.haml
View file @
c5160c11
-
page_title
'Labels'
-
page_title
'Labels'
-
issuables
=
[
'issues'
,
'merge requests'
]
.top-area.adjust
.top-area.adjust
.nav-text
.nav-text
Labels can be applied to issues and merge requests. Group labels are available for any project within the group.
=
_
(
"Labels can be applied to %{features}. Group labels are available for any project within the group."
)
%
{
features:
issuables
.
to_sentence
}
.nav-controls
.nav-controls
-
if
can?
(
current_user
,
:admin_label
,
@group
)
-
if
can?
(
current_user
,
:admin_label
,
@group
)
...
@@ -16,4 +18,4 @@
...
@@ -16,4 +18,4 @@
=
paginate
@labels
,
theme:
'gitlab'
=
paginate
@labels
,
theme:
'gitlab'
-
else
-
else
.nothing-here-block
.nothing-here-block
No labels created yet.
=
_
(
"No labels created yet."
)
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