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
a41e398b
Commit
a41e398b
authored
Nov 15, 2017
by
Jarka Kadlecova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add epics to EEU license
parent
13395b51
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
16 deletions
+20
-16
app/views/layouts/nav/sidebar/_group.html.haml
app/views/layouts/nav/sidebar/_group.html.haml
+2
-16
ee/app/views/layouts/nav/ee/_epic_link.html.haml
ee/app/views/layouts/nav/ee/_epic_link.html.haml
+18
-0
No files found.
app/views/layouts/nav/sidebar/_group.html.haml
View file @
a41e398b
-
issues
=
IssuesFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
).
execute
-
issues
=
IssuesFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
).
execute
-
merge_requests
=
MergeRequestsFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
,
non_archived:
true
).
execute
-
merge_requests
=
MergeRequestsFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
,
non_archived:
true
).
execute
-
epics
=
EpicsFinder
.
new
(
current_user
,
group_id:
@group
.
id
).
execute
-
epics_items
=
[
'epics#show'
,
'epics#index'
]
-
issues_sub_menu_items
=
[
'groups#issues'
,
'labels#index'
,
'milestones#index'
]
-
issues_sub_menu_items
=
[
'groups#issues'
,
'labels#index'
,
'milestones#index'
]
-
if
@group
.
feature_available?
(
:group_issue_boards
)
-
if
@group
.
feature_available?
(
:group_issue_boards
)
-
issues_sub_menu_items
.
push
(
'boards#index'
,
'boards#show'
)
-
issues_sub_menu_items
.
push
(
'boards#index'
,
'boards#show'
)
...
@@ -45,20 +43,8 @@
...
@@ -45,20 +43,8 @@
%span
%span
Contribution Analytics
Contribution Analytics
-# TODO: Add the flag check to only show epics if available
=
nav_link
(
path:
epics_items
)
do
=
render
"layouts/nav/ee/epic_link"
,
group:
@group
=
link_to
group_epics_path
(
@group
)
do
.nav-icon-container
=
sprite_icon
(
'epic'
)
%span
.nav-item-name
Epics
%span
.badge.count
=
number_with_delimiter
(
epics
.
count
)
%ul
.sidebar-sub-level-items.is-fly-out-only
=
nav_link
(
path:
epics_items
,
html_options:
{
class:
"fly-out-top-item"
}
)
do
=
link_to
group_epics_path
(
@group
)
do
%strong
.fly-out-top-item-name
#{
_
(
'Epics'
)
}
%span
.badge.count.epic_counter.fly-out-badge
=
number_with_delimiter
(
epics
.
count
)
=
nav_link
(
path:
issues_sub_menu_items
)
do
=
nav_link
(
path:
issues_sub_menu_items
)
do
=
link_to
issues_group_path
(
@group
)
do
=
link_to
issues_group_path
(
@group
)
do
...
...
ee/app/views/layouts/nav/ee/_epic_link.html.haml
0 → 100644
View file @
a41e398b
-
return
unless
group
.
feature_available?
(
:epics
)
-
epics
=
EpicsFinder
.
new
(
current_user
,
group_id:
@group
.
id
).
execute
-
epics_items
=
[
'epics#show'
,
'epics#index'
]
=
nav_link
(
path:
epics_items
)
do
=
link_to
group_epics_path
(
group
)
do
.nav-icon-container
=
sprite_icon
(
'epic'
)
%span
.nav-item-name
Epics
%span
.badge.count
=
number_with_delimiter
(
epics
.
count
)
%ul
.sidebar-sub-level-items.is-fly-out-only
=
nav_link
(
path:
epics_items
,
html_options:
{
class:
"fly-out-top-item"
}
)
do
=
link_to
group_epics_path
(
group
)
do
%strong
.fly-out-top-item-name
#{
_
(
'Epics'
)
}
%span
.badge.count.epic_counter.fly-out-badge
=
number_with_delimiter
(
epics
.
count
)
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