diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-03-06 18:33:17 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-03-06 18:33:17 +0000 |
| commit | c5160c11c0364bb577d7b4ef56784fc709b301d4 (patch) | |
| tree | 7b15e5141c7c0c51afe51ec73ae1b7d2382d6a8c | |
| parent | 2d00d6d459164f9c51f9e04fe56aecdca5edfe24 (diff) | |
| parent | 2169da03549cef9daad0d5918800b054ff6d3c09 (diff) | |
| download | gitlab-ce-c5160c11c0364bb577d7b4ef56784fc709b301d4.tar.gz | |
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
3 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue index 3b17135f0e5..c1dd4d42d9d 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue @@ -88,7 +88,7 @@ export default { </script> <template> - <div class="block labels"> + <div class="block labels js-labels-block"> <dropdown-value-collapsed v-if="showCreate" :labels="context.labels" @@ -104,7 +104,7 @@ export default { </dropdown-value> <div v-if="canEdit" - class="selectbox" + class="selectbox js-selectbox" style="display: none;" > <dropdown-hidden-input diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue index ba4c8fba5ec..69d588eb25d 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue @@ -35,7 +35,7 @@ export default { </script> <template> - <div class="hide-collapsed value issuable-show-labels"> + <div class="hide-collapsed value issuable-show-labels js-value"> <span v-if="isEmpty" class="text-secondary" diff --git a/app/views/groups/labels/index.html.haml b/app/views/groups/labels/index.html.haml index d10efdad53b..ac7e12fcd0b 100644 --- a/app/views/groups/labels/index.html.haml +++ b/app/views/groups/labels/index.html.haml @@ -1,8 +1,10 @@ - page_title 'Labels' +- issuables = ['issues', 'merge requests'] + .top-area.adjust .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 - if can?(current_user, :admin_label, @group) @@ -16,4 +18,4 @@ = paginate @labels, theme: 'gitlab' - else .nothing-here-block - No labels created yet. + = _("No labels created yet.") |