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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
49d16fd2
Commit
49d16fd2
authored
Dec 07, 2021
by
Coung Ngo
Committed by
Jacques Erasmus
Dec 07, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move labels code to ~/labels
parent
f8382631
Changes
22
Show whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
29 additions
and
29 deletions
+29
-29
app/assets/javascripts/issuable_bulk_update_sidebar/issuable_bulk_update_sidebar.js
...uable_bulk_update_sidebar/issuable_bulk_update_sidebar.js
+1
-1
app/assets/javascripts/labels/create_label.js
app/assets/javascripts/labels/create_label.js
+2
-2
app/assets/javascripts/labels/delete_label_modal.js
app/assets/javascripts/labels/delete_label_modal.js
+0
-0
app/assets/javascripts/labels/group_label_subscription.js
app/assets/javascripts/labels/group_label_subscription.js
+2
-2
app/assets/javascripts/labels/init_labels.js
app/assets/javascripts/labels/init_labels.js
+0
-0
app/assets/javascripts/labels/label_manager.js
app/assets/javascripts/labels/label_manager.js
+3
-3
app/assets/javascripts/labels/labels.js
app/assets/javascripts/labels/labels.js
+0
-0
app/assets/javascripts/labels/labels_select.js
app/assets/javascripts/labels/labels_select.js
+3
-3
app/assets/javascripts/labels/project_label_subscription.js
app/assets/javascripts/labels/project_label_subscription.js
+3
-3
app/assets/javascripts/pages/admin/labels/edit/index.js
app/assets/javascripts/pages/admin/labels/edit/index.js
+1
-1
app/assets/javascripts/pages/admin/labels/new/index.js
app/assets/javascripts/pages/admin/labels/new/index.js
+1
-1
app/assets/javascripts/pages/groups/labels/edit/index.js
app/assets/javascripts/pages/groups/labels/edit/index.js
+1
-1
app/assets/javascripts/pages/groups/labels/index/index.js
app/assets/javascripts/pages/groups/labels/index/index.js
+2
-2
app/assets/javascripts/pages/groups/labels/new/index.js
app/assets/javascripts/pages/groups/labels/new/index.js
+1
-1
app/assets/javascripts/pages/projects/issues/form.js
app/assets/javascripts/pages/projects/issues/form.js
+1
-1
app/assets/javascripts/pages/projects/labels/edit/index.js
app/assets/javascripts/pages/projects/labels/edit/index.js
+1
-1
app/assets/javascripts/pages/projects/labels/index/index.js
app/assets/javascripts/pages/projects/labels/index/index.js
+2
-2
app/assets/javascripts/pages/projects/labels/new/index.js
app/assets/javascripts/pages/projects/labels/new/index.js
+1
-1
app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js
...ripts/pages/projects/merge_requests/init_merge_request.js
+1
-1
ee/app/assets/javascripts/labels/labels.js
ee/app/assets/javascripts/labels/labels.js
+1
-1
spec/frontend/labels/delete_label_modal_spec.js
spec/frontend/labels/delete_label_modal_spec.js
+1
-1
spec/frontend/labels/labels_select_spec.js
spec/frontend/labels/labels_select_spec.js
+1
-1
No files found.
app/assets/javascripts/issuable_bulk_update_sidebar/issuable_bulk_update_sidebar.js
View file @
49d16fd2
...
@@ -4,7 +4,7 @@ import $ from 'jquery';
...
@@ -4,7 +4,7 @@ import $ from 'jquery';
import
{
property
}
from
'
lodash
'
;
import
{
property
}
from
'
lodash
'
;
import
issueableEventHub
from
'
~/issues_list/eventhub
'
;
import
issueableEventHub
from
'
~/issues_list/eventhub
'
;
import
LabelsSelect
from
'
~/labels_select
'
;
import
LabelsSelect
from
'
~/labels
/labels
_select
'
;
import
MilestoneSelect
from
'
~/milestones/milestone_select
'
;
import
MilestoneSelect
from
'
~/milestones/milestone_select
'
;
import
initIssueStatusSelect
from
'
./init_issue_status_select
'
;
import
initIssueStatusSelect
from
'
./init_issue_status_select
'
;
import
IssuableBulkUpdateActions
from
'
./issuable_bulk_update_actions
'
;
import
IssuableBulkUpdateActions
from
'
./issuable_bulk_update_actions
'
;
...
...
app/assets/javascripts/create_label.js
→
app/assets/javascripts/
labels/
create_label.js
View file @
49d16fd2
/* eslint-disable func-names */
/* eslint-disable func-names */
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
Api
from
'
.
/api
'
;
import
Api
from
'
~
/api
'
;
import
{
humanize
}
from
'
.
/lib/utils/text_utility
'
;
import
{
humanize
}
from
'
~
/lib/utils/text_utility
'
;
export
default
class
CreateLabelDropdown
{
export
default
class
CreateLabelDropdown
{
constructor
(
$el
,
namespacePath
,
projectPath
)
{
constructor
(
$el
,
namespacePath
,
projectPath
)
{
...
...
app/assets/javascripts/delete_label_modal.js
→
app/assets/javascripts/
labels/
delete_label_modal.js
View file @
49d16fd2
File moved
app/assets/javascripts/group_label_subscription.js
→
app/assets/javascripts/
labels/
group_label_subscription.js
View file @
49d16fd2
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
fixTitle
,
hide
}
from
'
~/tooltips
'
;
import
{
fixTitle
,
hide
}
from
'
~/tooltips
'
;
import
createFlash
from
'
.
/flash
'
;
import
createFlash
from
'
~
/flash
'
;
import
axios
from
'
.
/lib/utils/axios_utils
'
;
import
axios
from
'
~
/lib/utils/axios_utils
'
;
const
tooltipTitles
=
{
const
tooltipTitles
=
{
group
:
__
(
'
Unsubscribe at group level
'
),
group
:
__
(
'
Unsubscribe at group level
'
),
...
...
app/assets/javascripts/init_labels.js
→
app/assets/javascripts/
labels/
init_labels.js
View file @
49d16fd2
File moved
app/assets/javascripts/label_manager.js
→
app/assets/javascripts/label
s/label
_manager.js
View file @
49d16fd2
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
Sortable
from
'
sortablejs
'
;
import
Sortable
from
'
sortablejs
'
;
import
{
dispose
}
from
'
~/tooltips
'
;
import
{
dispose
}
from
'
~/tooltips
'
;
import
createFlash
from
'
.
/flash
'
;
import
createFlash
from
'
~
/flash
'
;
import
axios
from
'
.
/lib/utils/axios_utils
'
;
import
axios
from
'
~
/lib/utils/axios_utils
'
;
import
{
__
}
from
'
.
/locale
'
;
import
{
__
}
from
'
~
/locale
'
;
export
default
class
LabelManager
{
export
default
class
LabelManager
{
constructor
({
togglePriorityButton
,
prioritizedLabels
,
otherLabels
}
=
{})
{
constructor
({
togglePriorityButton
,
prioritizedLabels
,
otherLabels
}
=
{})
{
...
...
app/assets/javascripts/labels.js
→
app/assets/javascripts/labels
/labels
.js
View file @
49d16fd2
File moved
app/assets/javascripts/labels_select.js
→
app/assets/javascripts/labels
/labels
_select.js
View file @
49d16fd2
...
@@ -6,10 +6,10 @@ import { difference, isEqual, escape, sortBy, template, union } from 'lodash';
...
@@ -6,10 +6,10 @@ import { difference, isEqual, escape, sortBy, template, union } from 'lodash';
import
initDeprecatedJQueryDropdown
from
'
~/deprecated_jquery_dropdown
'
;
import
initDeprecatedJQueryDropdown
from
'
~/deprecated_jquery_dropdown
'
;
import
IssuableBulkUpdateActions
from
'
~/issuable_bulk_update_sidebar/issuable_bulk_update_actions
'
;
import
IssuableBulkUpdateActions
from
'
~/issuable_bulk_update_sidebar/issuable_bulk_update_actions
'
;
import
{
isScopedLabel
}
from
'
~/lib/utils/common_utils
'
;
import
{
isScopedLabel
}
from
'
~/lib/utils/common_utils
'
;
import
createFlash
from
'
~/flash
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
{
sprintf
,
__
}
from
'
~/locale
'
;
import
CreateLabelDropdown
from
'
./create_label
'
;
import
CreateLabelDropdown
from
'
./create_label
'
;
import
createFlash
from
'
./flash
'
;
import
axios
from
'
./lib/utils/axios_utils
'
;
import
{
sprintf
,
__
}
from
'
./locale
'
;
export
default
class
LabelsSelect
{
export
default
class
LabelsSelect
{
constructor
(
els
,
options
=
{})
{
constructor
(
els
,
options
=
{})
{
...
...
app/assets/javascripts/project_label_subscription.js
→
app/assets/javascripts/
labels/
project_label_subscription.js
View file @
49d16fd2
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
{
fixTitle
}
from
'
~/tooltips
'
;
import
{
fixTitle
}
from
'
~/tooltips
'
;
import
createFlash
from
'
.
/flash
'
;
import
createFlash
from
'
~
/flash
'
;
import
axios
from
'
.
/lib/utils/axios_utils
'
;
import
axios
from
'
~
/lib/utils/axios_utils
'
;
import
{
__
}
from
'
.
/locale
'
;
import
{
__
}
from
'
~
/locale
'
;
const
tooltipTitles
=
{
const
tooltipTitles
=
{
group
:
{
group
:
{
...
...
app/assets/javascripts/pages/admin/labels/edit/index.js
View file @
49d16fd2
import
Labels
from
'
../../../..
/labels
'
;
import
Labels
from
'
~/labels
/labels
'
;
new
Labels
();
// eslint-disable-line no-new
new
Labels
();
// eslint-disable-line no-new
app/assets/javascripts/pages/admin/labels/new/index.js
View file @
49d16fd2
import
Labels
from
'
../../../..
/labels
'
;
import
Labels
from
'
~/labels
/labels
'
;
new
Labels
();
// eslint-disable-line no-new
new
Labels
();
// eslint-disable-line no-new
app/assets/javascripts/pages/groups/labels/edit/index.js
View file @
49d16fd2
import
Labels
from
'
ee_else_ce/labels
'
;
import
Labels
from
'
ee_else_ce/labels
/labels
'
;
// eslint-disable-next-line no-new
// eslint-disable-next-line no-new
new
Labels
();
new
Labels
();
app/assets/javascripts/pages/groups/labels/index/index.js
View file @
49d16fd2
import
initDeleteLabelModal
from
'
~/delete_label_modal
'
;
import
initDeleteLabelModal
from
'
~/
labels/
delete_label_modal
'
;
import
initLabels
from
'
~/init_labels
'
;
import
initLabels
from
'
~/
labels/
init_labels
'
;
initLabels
();
initLabels
();
initDeleteLabelModal
();
initDeleteLabelModal
();
app/assets/javascripts/pages/groups/labels/new/index.js
View file @
49d16fd2
import
Labels
from
'
ee_else_ce/labels
'
;
import
Labels
from
'
ee_else_ce/labels
/labels
'
;
// eslint-disable-next-line no-new
// eslint-disable-next-line no-new
new
Labels
();
new
Labels
();
app/assets/javascripts/pages/projects/issues/form.js
View file @
49d16fd2
...
@@ -6,7 +6,7 @@ import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation';
...
@@ -6,7 +6,7 @@ import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation';
import
GLForm
from
'
~/gl_form
'
;
import
GLForm
from
'
~/gl_form
'
;
import
initSuggestions
from
'
~/issues/suggestions
'
;
import
initSuggestions
from
'
~/issues/suggestions
'
;
import
initIssuableTypeSelector
from
'
~/issues/type_selector
'
;
import
initIssuableTypeSelector
from
'
~/issues/type_selector
'
;
import
LabelsSelect
from
'
~/labels_select
'
;
import
LabelsSelect
from
'
~/labels
/labels
_select
'
;
import
MilestoneSelect
from
'
~/milestones/milestone_select
'
;
import
MilestoneSelect
from
'
~/milestones/milestone_select
'
;
import
IssuableTemplateSelectors
from
'
~/templates/issuable_template_selectors
'
;
import
IssuableTemplateSelectors
from
'
~/templates/issuable_template_selectors
'
;
...
...
app/assets/javascripts/pages/projects/labels/edit/index.js
View file @
49d16fd2
import
Labels
from
'
ee_else_ce/labels
'
;
import
Labels
from
'
ee_else_ce/labels
/labels
'
;
new
Labels
();
// eslint-disable-line no-new
new
Labels
();
// eslint-disable-line no-new
app/assets/javascripts/pages/projects/labels/index/index.js
View file @
49d16fd2
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
initDeleteLabelModal
from
'
~/delete_label_modal
'
;
import
initDeleteLabelModal
from
'
~/
labels/
delete_label_modal
'
;
import
initLabels
from
'
~/init_labels
'
;
import
initLabels
from
'
~/
labels/
init_labels
'
;
import
{
BV_SHOW_MODAL
}
from
'
~/lib/utils/constants
'
;
import
{
BV_SHOW_MODAL
}
from
'
~/lib/utils/constants
'
;
import
Translate
from
'
~/vue_shared/translate
'
;
import
Translate
from
'
~/vue_shared/translate
'
;
import
PromoteLabelModal
from
'
../components/promote_label_modal.vue
'
;
import
PromoteLabelModal
from
'
../components/promote_label_modal.vue
'
;
...
...
app/assets/javascripts/pages/projects/labels/new/index.js
View file @
49d16fd2
import
Labels
from
'
ee_else_ce/labels
'
;
import
Labels
from
'
ee_else_ce/labels
/labels
'
;
// eslint-disable-next-line no-new
// eslint-disable-next-line no-new
new
Labels
();
new
Labels
();
app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js
View file @
49d16fd2
...
@@ -5,7 +5,7 @@ import IssuableForm from 'ee_else_ce/issuable_form';
...
@@ -5,7 +5,7 @@ import IssuableForm from 'ee_else_ce/issuable_form';
import
ShortcutsNavigation
from
'
~/behaviors/shortcuts/shortcuts_navigation
'
;
import
ShortcutsNavigation
from
'
~/behaviors/shortcuts/shortcuts_navigation
'
;
import
Diff
from
'
~/diff
'
;
import
Diff
from
'
~/diff
'
;
import
GLForm
from
'
~/gl_form
'
;
import
GLForm
from
'
~/gl_form
'
;
import
LabelsSelect
from
'
~/labels_select
'
;
import
LabelsSelect
from
'
~/labels
/labels
_select
'
;
import
MilestoneSelect
from
'
~/milestones/milestone_select
'
;
import
MilestoneSelect
from
'
~/milestones/milestone_select
'
;
import
IssuableTemplateSelectors
from
'
~/templates/issuable_template_selectors
'
;
import
IssuableTemplateSelectors
from
'
~/templates/issuable_template_selectors
'
;
...
...
ee/app/assets/javascripts/labels.js
→
ee/app/assets/javascripts/labels
/labels
.js
View file @
49d16fd2
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
Labels
from
'
~/labels
'
;
import
Labels
from
'
~/labels
/labels
'
;
import
{
isScopedLabel
}
from
'
~/lib/utils/common_utils
'
;
import
{
isScopedLabel
}
from
'
~/lib/utils/common_utils
'
;
class
LabelsEE
extends
Labels
{
class
LabelsEE
extends
Labels
{
...
...
spec/frontend/delete_label_modal_spec.js
→
spec/frontend/
labels/
delete_label_modal_spec.js
View file @
49d16fd2
import
{
TEST_HOST
}
from
'
helpers/test_constants
'
;
import
{
TEST_HOST
}
from
'
helpers/test_constants
'
;
import
initDeleteLabelModal
from
'
~/delete_label_modal
'
;
import
initDeleteLabelModal
from
'
~/
labels/
delete_label_modal
'
;
describe
(
'
DeleteLabelModal
'
,
()
=>
{
describe
(
'
DeleteLabelModal
'
,
()
=>
{
const
buttons
=
[
const
buttons
=
[
...
...
spec/frontend/labels_select_spec.js
→
spec/frontend/labels
/labels
_select_spec.js
View file @
49d16fd2
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
LabelsSelect
from
'
~/labels_select
'
;
import
LabelsSelect
from
'
~/labels
/labels
_select
'
;
const
mockUrl
=
'
/foo/bar/url
'
;
const
mockUrl
=
'
/foo/bar/url
'
;
...
...
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