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
Boxiang Sun
gitlab-ce
Commits
1b5f1795
Commit
1b5f1795
authored
Jan 12, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'projects-l' into 'master'
Refactor projects:l* See merge request gitlab-org/gitlab-ce!16393
parents
e4aa2bd3
d85f72b1
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
2 deletions
+41
-2
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+14
-2
app/assets/javascripts/init_labels.js
app/assets/javascripts/init_labels.js
+18
-0
app/assets/javascripts/pages/projects/labels/edit/index.js
app/assets/javascripts/pages/projects/labels/edit/index.js
+3
-0
app/assets/javascripts/pages/projects/labels/index/index.js
app/assets/javascripts/pages/projects/labels/index/index.js
+3
-0
app/assets/javascripts/pages/projects/labels/new/index.js
app/assets/javascripts/pages/projects/labels/new/index.js
+3
-0
No files found.
app/assets/javascripts/dispatcher.js
View file @
1b5f1795
...
...
@@ -442,12 +442,24 @@ import Activities from './activities';
break
;
case
'
groups:labels:new
'
:
case
'
groups:labels:edit
'
:
new
Labels
();
break
;
case
'
projects:labels:new
'
:
import
(
'
./pages/projects/labels/new
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'
projects:labels:edit
'
:
new
Labels
();
import
(
'
./pages/projects/labels/edit
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'
groups:labels:index
'
:
case
'
projects:labels:index
'
:
import
(
'
./pages/projects/labels/index
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'
groups:labels:index
'
:
if
(
$
(
'
.prioritized-labels
'
).
length
)
{
new
LabelManager
();
}
...
...
app/assets/javascripts/init_labels.js
0 → 100644
View file @
1b5f1795
import
LabelManager
from
'
./label_manager
'
;
import
GroupLabelSubscription
from
'
./group_label_subscription
'
;
import
ProjectLabelSubscription
from
'
./project_label_subscription
'
;
export
default
()
=>
{
if
(
$
(
'
.prioritized-labels
'
).
length
)
{
new
LabelManager
();
// eslint-disable-line no-new
}
$
(
'
.label-subscription
'
).
each
((
i
,
el
)
=>
{
const
$el
=
$
(
el
);
if
(
$el
.
find
(
'
.dropdown-group-label
'
).
length
)
{
new
GroupLabelSubscription
(
$el
);
// eslint-disable-line no-new
}
else
{
new
ProjectLabelSubscription
(
$el
);
// eslint-disable-line no-new
}
});
};
app/assets/javascripts/pages/projects/labels/edit/index.js
0 → 100644
View file @
1b5f1795
import
Labels
from
'
~/labels
'
;
export
default
()
=>
new
Labels
();
app/assets/javascripts/pages/projects/labels/index/index.js
0 → 100644
View file @
1b5f1795
import
initLabels
from
'
~/init_labels
'
;
export
default
initLabels
;
app/assets/javascripts/pages/projects/labels/new/index.js
0 → 100644
View file @
1b5f1795
import
Labels
from
'
~/labels
'
;
export
default
()
=>
new
Labels
();
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