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
4c5f5675
Commit
4c5f5675
authored
Mar 10, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added the following group settings to the tab:
* Audit Events * Pipeline quotas * Analytics
parent
2018e51b
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
32 additions
and
43 deletions
+32
-43
app/views/groups/_settings_head.html.haml
app/views/groups/_settings_head.html.haml
+25
-5
app/views/groups/analytics/show.html.haml
app/views/groups/analytics/show.html.haml
+1
-0
app/views/groups/audit_events/index.html.haml
app/views/groups/audit_events/index.html.haml
+2
-0
app/views/groups/hooks/index.html.haml
app/views/groups/hooks/index.html.haml
+1
-0
app/views/groups/pipeline_quota/index.html.haml
app/views/groups/pipeline_quota/index.html.haml
+2
-0
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+1
-1
app/views/layouts/nav/_group_settings.html.haml
app/views/layouts/nav/_group_settings.html.haml
+0
-37
No files found.
app/views/groups/_settings_head.html.haml
View file @
4c5f5675
-
can_admin_group
=
can?
(
current_user
,
:admin_group
,
@group
)
-
can_edit
=
can?
(
current_user
,
:admin_group
,
@group
)
=
content_for
:sub_nav
do
.scrolling-tabs-container.sub-nav-scroll
=
render
'shared/nav_scroll'
...
...
@@ -7,8 +9,26 @@
=
link_to
projects_group_path
(
@group
),
title:
'Projects'
do
%span
Projects
=
nav_link
(
path:
'groups#edit'
)
do
=
link_to
edit_group_path
(
@group
),
title:
'Edit Group'
do
%span
Edit Group
\ No newline at end of file
-
if
can_edit
-
if
ldap_enabled?
=
nav_link
(
path:
'ldap_group_links#index'
)
do
=
link_to
group_ldap_group_links_path
(
@group
),
title:
'LDAP Group'
do
%span
LDAP Group
=
nav_link
(
path:
'hooks#index'
)
do
=
link_to
group_hooks_path
(
@group
),
title:
'Webhooks'
do
%span
Webhooks
=
nav_link
(
path:
'audit_events#index'
)
do
=
link_to
group_audit_events_path
(
@group
),
title:
'Audit Events'
do
%span
Audit Events
-
if
@group
.
shared_runners_enabled?
&&
@group
.
shared_runners_minutes_limit_enabled?
=
nav_link
(
path:
'pipeline_quota#index'
)
do
=
link_to
group_audit_events_path
(
@group
),
title:
'Pipelines quota'
do
%span
Pipelines quota
=
nav_link
(
path:
'groups#edit'
)
do
=
link_to
edit_group_path
(
@group
),
title:
'Edit Group'
do
%span
Edit Group
\ No newline at end of file
app/views/groups/analytics/show.html.haml
View file @
4c5f5675
-
page_title
"Contribution Analytics"
-
header_title
group_title
(
@group
,
"Contribution Analytics"
,
group_analytics_path
(
@group
))
=
render
"groups/settings_head"
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'common_d3'
)
=
page_specific_javascript_bundle_tag
(
'graphs'
)
...
...
app/views/groups/audit_events/index.html.haml
View file @
4c5f5675
-
page_title
"Audit Events"
=
render
"groups/settings_head"
%h3
.page-title
Group Audit Events
%p
.light
Events in
#{
@group
.
name
}
...
...
app/views/groups/hooks/index.html.haml
View file @
4c5f5675
=
render
"groups/settings_head"
=
render
'shared/web_hooks/form'
,
hook:
@hook
,
hooks:
@hooks
,
url_components:
[
@group
]
app/views/groups/pipeline_quota/index.html.haml
View file @
4c5f5675
-
page_title
"Pipelines quota"
=
render
"groups/settings_head"
%h3
.page-title
Group pipelines quota
=
link_to
icon
(
'question-circle'
),
help_page_path
(
"user/admin_area/settings/continuous_integration"
,
anchor:
"shared-runners-build-minutes-quota"
),
target:
'_blank'
...
...
app/views/layouts/nav/_group.html.haml
View file @
4c5f5675
...
...
@@ -26,7 +26,7 @@
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
%span
Members
=
nav_link
(
controller:
[
:stats
])
do
=
nav_link
(
controller:
[
:stats
])
do
=
link_to
group_analytics_path
(
@group
),
title:
'Contribution Analytics'
,
data:
{
placement:
'right'
}
do
%span
Contribution Analytics
...
...
app/views/layouts/nav/_group_settings.html.haml
deleted
100644 → 0
View file @
2018e51b
-
if
current_user
-
can_admin_group
=
can?
(
current_user
,
:admin_group
,
@group
)
-
can_edit
=
can?
(
current_user
,
:admin_group
,
@group
)
-
if
can_admin_group
||
can_edit
.controls
.dropdown.group-settings-dropdown
%a
.dropdown-new.btn.btn-default
#group-settings-button
{
href:
'#'
,
'data-toggle'
=>
'dropdown'
}
=
icon
(
'cog'
)
=
icon
(
'caret-down'
)
%ul
.dropdown-menu.dropdown-menu-align-right
-
if
can_admin_group
=
nav_link
(
path:
'groups#projects'
)
do
=
link_to
'Projects'
,
projects_group_path
(
@group
),
title:
'Projects'
-
if
can_edit
&&
can_admin_group
%li
.divider
-
if
can_edit
-
if
ldap_enabled?
=
nav_link
(
controller: :ldap_group_links
)
do
=
link_to
group_ldap_group_links_path
(
@group
),
title:
"LDAP Groups"
do
%span
LDAP Groups
=
nav_link
(
controller: :hooks
)
do
=
link_to
group_hooks_path
(
@group
),
title:
"Webhooks"
do
%span
Webhooks
=
nav_link
(
controller: :audit_events
)
do
=
link_to
group_audit_events_path
(
@group
),
title:
"Audit Events"
do
%span
Audit Events
-
if
@group
.
shared_runners_enabled?
&&
@group
.
shared_runners_minutes_limit_enabled?
=
nav_link
(
controller: :pipeline_quota
)
do
=
link_to
group_pipeline_quota_path
(
@group
),
title:
"Pipelines quota"
do
%span
Pipelines quota
%li
=
link_to
'Edit Group'
,
edit_group_path
(
@group
)
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