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
425ed71c
Commit
425ed71c
authored
Nov 30, 2021
by
Mehul Sharma
Committed by
Dylan Griffith
Nov 30, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates Compliance nav item and breadcrumb to use sentence casing
parent
a7d51dce
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
62 additions
and
50 deletions
+62
-50
ee/lib/ee/sidebars/projects/menus/security_compliance_menu.rb
...ib/ee/sidebars/projects/menus/security_compliance_menu.rb
+7
-7
ee/lib/sidebars/groups/menus/security_compliance_menu.rb
ee/lib/sidebars/groups/menus/security_compliance_menu.rb
+3
-3
ee/spec/controllers/projects/dependencies_controller_spec.rb
ee/spec/controllers/projects/dependencies_controller_spec.rb
+1
-1
ee/spec/features/groups/audit_events_spec.rb
ee/spec/features/groups/audit_events_spec.rb
+5
-5
ee/spec/features/groups/navbar_spec.rb
ee/spec/features/groups/navbar_spec.rb
+3
-3
ee/spec/features/projects/audit_events_spec.rb
ee/spec/features/projects/audit_events_spec.rb
+5
-5
ee/spec/features/projects/navbar_spec.rb
ee/spec/features/projects/navbar_spec.rb
+4
-4
ee/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb
ee/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb
+2
-2
ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
+8
-8
locale/gitlab.pot
locale/gitlab.pot
+13
-1
qa/qa/ee/page/group/menu.rb
qa/qa/ee/page/group/menu.rb
+3
-3
qa/qa/ee/page/project/sub_menus/license_compliance.rb
qa/qa/ee/page/project/sub_menus/license_compliance.rb
+1
-1
qa/qa/ee/page/project/sub_menus/security_compliance.rb
qa/qa/ee/page/project/sub_menus/security_compliance.rb
+5
-5
spec/support/shared_contexts/navbar_structure_context.rb
spec/support/shared_contexts/navbar_structure_context.rb
+2
-2
No files found.
ee/lib/ee/sidebars/projects/menus/security_compliance_menu.rb
View file @
425ed71c
...
...
@@ -66,7 +66,7 @@ module EE
end
::
Sidebars
::
MenuItem
.
new
(
title:
_
(
'Security
D
ashboard'
),
title:
_
(
'Security
d
ashboard'
),
link:
project_security_dashboard_index_path
(
context
.
project
),
active_routes:
{
path:
'projects/security/dashboard#index'
},
item_id: :dashboard
...
...
@@ -79,7 +79,7 @@ module EE
end
::
Sidebars
::
MenuItem
.
new
(
title:
_
(
'Vulnerability
R
eport'
),
title:
_
(
'Vulnerability
r
eport'
),
link:
project_security_vulnerability_report_index_path
(
context
.
project
),
active_routes:
{
path:
%w[projects/security/vulnerability_report#index projects/security/vulnerabilities#show]
},
item_id: :vulnerability_report
...
...
@@ -98,7 +98,7 @@ module EE
end
::
Sidebars
::
MenuItem
.
new
(
title:
s_
(
'OnDemandScans|On-demand
S
cans'
),
title:
s_
(
'OnDemandScans|On-demand
s
cans'
),
link:
link
,
item_id: :on_demand_scans
,
active_routes:
{
path:
%w[
...
...
@@ -115,7 +115,7 @@ module EE
end
::
Sidebars
::
MenuItem
.
new
(
title:
_
(
'Dependency
L
ist'
),
title:
_
(
'Dependency
l
ist'
),
link:
project_dependencies_path
(
context
.
project
),
active_routes:
{
path:
'projects/dependencies#index'
},
item_id: :dependency_list
...
...
@@ -128,7 +128,7 @@ module EE
end
::
Sidebars
::
MenuItem
.
new
(
title:
_
(
'License
C
ompliance'
),
title:
_
(
'License
c
ompliance'
),
link:
project_licenses_path
(
context
.
project
),
active_routes:
{
path:
'projects/licenses#index'
},
item_id: :license_compliance
...
...
@@ -141,7 +141,7 @@ module EE
end
::
Sidebars
::
MenuItem
.
new
(
title:
_
(
'Threat
M
onitoring'
),
title:
_
(
'Threat
m
onitoring'
),
link:
project_threat_monitoring_path
(
context
.
project
),
active_routes:
{
controller:
[
'projects/threat_monitoring'
]
},
item_id: :threat_monitoring
...
...
@@ -167,7 +167,7 @@ module EE
end
::
Sidebars
::
MenuItem
.
new
(
title:
_
(
'Audit
E
vents'
),
title:
_
(
'Audit
e
vents'
),
link:
project_audit_events_path
(
context
.
project
),
active_routes:
{
controller: :audit_events
},
item_id: :audit_events
...
...
ee/lib/sidebars/groups/menus/security_compliance_menu.rb
View file @
425ed71c
...
...
@@ -52,7 +52,7 @@ module Sidebars
end
::
Sidebars
::
MenuItem
.
new
(
title:
_
(
'Security
D
ashboard'
),
title:
_
(
'Security
d
ashboard'
),
link:
group_security_dashboard_path
(
context
.
group
),
active_routes:
{
path:
'dashboard#show'
},
item_id: :security_dashboard
...
...
@@ -65,7 +65,7 @@ module Sidebars
end
::
Sidebars
::
MenuItem
.
new
(
title:
_
(
'Vulnerability
R
eport'
),
title:
_
(
'Vulnerability
r
eport'
),
link:
group_security_vulnerabilities_path
(
context
.
group
),
active_routes:
{
path:
'vulnerabilities#index'
},
item_id: :vulnerability_report
...
...
@@ -115,7 +115,7 @@ module Sidebars
end
::
Sidebars
::
MenuItem
.
new
(
title:
_
(
'Audit
E
vents'
),
title:
_
(
'Audit
e
vents'
),
link:
group_audit_events_path
(
context
.
group
),
active_routes:
{
path:
'audit_events#index'
},
item_id: :audit_events
...
...
ee/spec/controllers/projects/dependencies_controller_spec.rb
View file @
425ed71c
...
...
@@ -39,7 +39,7 @@ RSpec.describe Projects::DependenciesController do
it
{
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
}
it
'renders the side navigation with the correct submenu set as active'
do
expect
(
response
.
body
).
to
have_active_sub_navigation
(
'Dependency
L
ist'
)
expect
(
response
.
body
).
to
have_active_sub_navigation
(
'Dependency
l
ist'
)
end
end
...
...
ee/spec/features/groups/audit_events_spec.rb
View file @
425ed71c
...
...
@@ -28,17 +28,17 @@ RSpec.describe 'Groups > Audit Events', :js do
expect
(
reqs
.
first
.
status_code
).
to
eq
(
404
)
end
it
'does not have Audit
E
vents button in head nav bar'
do
it
'does not have Audit
e
vents button in head nav bar'
do
visit
group_security_dashboard_path
(
group
)
expect
(
page
).
not_to
have_link
(
'Audit
E
vents'
)
expect
(
page
).
not_to
have_link
(
'Audit
e
vents'
)
end
end
it
'has Audit
E
vents button in head nav bar'
do
it
'has Audit
e
vents button in head nav bar'
do
visit
group_audit_events_path
(
group
)
expect
(
page
).
to
have_link
(
'Audit
E
vents'
)
expect
(
page
).
to
have_link
(
'Audit
e
vents'
)
end
describe
'changing a user access level'
do
...
...
@@ -54,7 +54,7 @@ RSpec.describe 'Groups > Audit Events', :js do
page
.
within
(
'.sidebar-top-level-items'
)
do
find
(
:link
,
text:
'Security & Compliance'
).
click
click_link
'Audit
E
vents'
click_link
'Audit
e
vents'
end
page
.
within
(
'.audit-log-table'
)
do
...
...
ee/spec/features/groups/navbar_spec.rb
View file @
425ed71c
...
...
@@ -145,10 +145,10 @@ RSpec.describe 'Group navbar' do
{
nav_item:
_
(
'Security & Compliance'
),
nav_sub_items:
[
_
(
'Security
D
ashboard'
),
_
(
'Vulnerability
R
eport'
),
_
(
'Security
d
ashboard'
),
_
(
'Vulnerability
r
eport'
),
_
(
'Compliance report'
),
_
(
'Audit
E
vents'
)
_
(
'Audit
e
vents'
)
]
}
end
...
...
ee/spec/features/projects/audit_events_spec.rb
View file @
425ed71c
...
...
@@ -30,7 +30,7 @@ RSpec.describe 'Projects > Audit Events', :js do
it
'does not have Audit Events button in head nav bar'
do
visit
edit_project_path
(
project
)
expect
(
page
).
not_to
have_link
(
'Audit
E
vents'
)
expect
(
page
).
not_to
have_link
(
'Audit
e
vents'
)
end
end
...
...
@@ -57,7 +57,7 @@ RSpec.describe 'Projects > Audit Events', :js do
it
'has Audit Events button in head nav bar'
do
visit
project_audit_events_path
(
project
)
expect
(
page
).
to
have_link
(
'Audit
E
vents'
)
expect
(
page
).
to
have_link
(
'Audit
e
vents'
)
end
it
'does not have Project audit events in the header'
do
...
...
@@ -70,7 +70,7 @@ RSpec.describe 'Projects > Audit Events', :js do
it
'has Audit Events button in head nav bar'
do
visit
project_audit_events_path
(
project
)
expect
(
page
).
to
have_link
(
'Audit
E
vents'
)
expect
(
page
).
to
have_link
(
'Audit
e
vents'
)
end
it
'has Project audit events in the header'
do
...
...
@@ -122,7 +122,7 @@ RSpec.describe 'Projects > Audit Events', :js do
page
.
within
(
'.sidebar-top-level-items'
)
do
find
(
:link
,
text:
'Security & Compliance'
).
click
click_link
'Audit
E
vents'
click_link
'Audit
e
vents'
end
page
.
within
(
'.audit-log-table'
)
do
...
...
@@ -160,7 +160,7 @@ RSpec.describe 'Projects > Audit Events', :js do
wait_for_all_requests
click_link
'Audit
E
vents'
click_link
'Audit
e
vents'
end
wait_for_all_requests
...
...
ee/spec/features/projects/navbar_spec.rb
View file @
425ed71c
...
...
@@ -40,10 +40,10 @@ RSpec.describe 'Project navbar' do
{
nav_item:
_
(
'Security & Compliance'
),
nav_sub_items:
[
_
(
'Security
D
ashboard'
),
_
(
'Vulnerability
R
eport'
),
s_
(
'OnDemandScans|On-demand
S
cans'
),
_
(
'Audit
E
vents'
),
_
(
'Security
d
ashboard'
),
_
(
'Vulnerability
r
eport'
),
s_
(
'OnDemandScans|On-demand
s
cans'
),
_
(
'Audit
e
vents'
),
_
(
'Configuration'
)
]
}
...
...
ee/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb
View file @
425ed71c
...
...
@@ -198,7 +198,7 @@ RSpec.describe 'layouts/nav/sidebar/_group' do
render
expect
(
rendered
).
not_to
have_link
'Security & Compliance'
expect
(
rendered
).
not_to
have_link
'Audit
E
vents'
expect
(
rendered
).
not_to
have_link
'Audit
e
vents'
end
end
...
...
@@ -212,7 +212,7 @@ RSpec.describe 'layouts/nav/sidebar/_group' do
render
expect
(
rendered
).
to
have_link
'Security & Compliance'
expect
(
rendered
).
to
have_link
'Audit
E
vents'
expect
(
rendered
).
to
have_link
'Audit
e
vents'
end
end
end
...
...
ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
View file @
425ed71c
...
...
@@ -176,27 +176,27 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
end
it
'security dashboard link is visible'
do
expect
(
rendered
).
to
have_link
(
'Security
D
ashboard'
,
href:
project_security_dashboard_index_path
(
project
))
expect
(
rendered
).
to
have_link
(
'Security
d
ashboard'
,
href:
project_security_dashboard_index_path
(
project
))
end
it
'security vulnerability report link is visible'
do
expect
(
rendered
).
to
have_link
(
'Vulnerability
R
eport'
,
href:
project_security_vulnerability_report_index_path
(
project
))
expect
(
rendered
).
to
have_link
(
'Vulnerability
r
eport'
,
href:
project_security_vulnerability_report_index_path
(
project
))
end
it
'security on demand scans link is visible'
do
expect
(
rendered
).
to
have_link
(
'On-demand
S
cans'
,
href:
project_on_demand_scans_path
(
project
))
expect
(
rendered
).
to
have_link
(
'On-demand
s
cans'
,
href:
project_on_demand_scans_path
(
project
))
end
it
'dependency list link is visible'
do
expect
(
rendered
).
to
have_link
(
'Dependency
L
ist'
,
href:
project_dependencies_path
(
project
))
expect
(
rendered
).
to
have_link
(
'Dependency
l
ist'
,
href:
project_dependencies_path
(
project
))
end
it
'license compliance link is visible'
do
expect
(
rendered
).
to
have_link
(
'License
C
ompliance'
,
href:
project_licenses_path
(
project
))
expect
(
rendered
).
to
have_link
(
'License
c
ompliance'
,
href:
project_licenses_path
(
project
))
end
it
'threat monitoring link is visible'
do
expect
(
rendered
).
to
have_link
(
'Threat
M
onitoring'
,
href:
project_threat_monitoring_path
(
project
))
expect
(
rendered
).
to
have_link
(
'Threat
m
onitoring'
,
href:
project_threat_monitoring_path
(
project
))
end
it
'policies link is visible'
do
...
...
@@ -208,7 +208,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
end
it
'audit events link is visible'
do
expect
(
rendered
).
to
have_link
(
'Audit
E
vents'
,
href:
project_audit_events_path
(
project
))
expect
(
rendered
).
to
have_link
(
'Audit
e
vents'
,
href:
project_audit_events_path
(
project
))
end
end
...
...
@@ -224,7 +224,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
end
it
'links to on-demand scans form instead of index page'
do
expect
(
rendered
).
to
have_link
(
'On-demand
S
cans'
,
href:
new_project_on_demand_scan_path
(
project
))
expect
(
rendered
).
to
have_link
(
'On-demand
s
cans'
,
href:
new_project_on_demand_scan_path
(
project
))
end
end
end
...
...
locale/gitlab.pot
View file @
425ed71c
...
...
@@ -4818,6 +4818,9 @@ msgstr ""
msgid "Audit Events"
msgstr ""
msgid "Audit events"
msgstr ""
msgid "AuditLogs|(removed)"
msgstr ""
...
...
@@ -11429,6 +11432,9 @@ msgstr ""
msgid "Dependency Scanning"
msgstr ""
msgid "Dependency list"
msgstr ""
msgid "DependencyProxy|Cached %{time}"
msgstr ""
...
...
@@ -20702,6 +20708,9 @@ msgstr ""
msgid "License Compliance"
msgstr ""
msgid "License compliance"
msgstr ""
msgid "License file"
msgstr ""
...
...
@@ -35855,7 +35864,7 @@ msgstr ""
msgid "Thread to reply to cannot be found"
msgstr ""
msgid "Threat
M
onitoring"
msgid "Threat
m
onitoring"
msgstr ""
msgid "ThreatMonitoring|Alert Details"
...
...
@@ -38552,6 +38561,9 @@ msgstr ""
msgid "Vulnerability remediated. Review before resolving."
msgstr ""
msgid "Vulnerability report"
msgstr ""
msgid "Vulnerability resolved in %{branch}"
msgstr ""
...
...
qa/qa/ee/page/group/menu.rb
View file @
425ed71c
...
...
@@ -72,7 +72,7 @@ module QA
def
click_group_security_link
hover_security_and_compliance
do
within_submenu
do
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Security
D
ashboard'
)
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Security
d
ashboard'
)
end
end
end
...
...
@@ -80,7 +80,7 @@ module QA
def
click_group_vulnerability_link
hover_security_and_compliance
do
within_submenu
do
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Vulnerability
R
eport'
)
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Vulnerability
r
eport'
)
end
end
end
...
...
@@ -88,7 +88,7 @@ module QA
def
go_to_audit_events
hover_security_and_compliance
do
within_submenu
do
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Audit
E
vents'
)
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Audit
e
vents'
)
end
end
end
...
...
qa/qa/ee/page/project/sub_menus/license_compliance.rb
View file @
425ed71c
...
...
@@ -11,7 +11,7 @@ module QA
def
click_on_license_compliance
hover_security_compliance
do
within_submenu
do
click_element
(
:sidebar_menu_item_link
,
menu_item:
'License
C
ompliance'
)
click_element
(
:sidebar_menu_item_link
,
menu_item:
'License
c
ompliance'
)
end
end
end
...
...
qa/qa/ee/page/project/sub_menus/security_compliance.rb
View file @
425ed71c
...
...
@@ -10,14 +10,14 @@ module QA
def
click_on_security_dashboard
within_sidebar
do
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Security
D
ashboard'
)
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Security
d
ashboard'
)
end
end
def
click_on_dependency_list
hover_security_compliance
do
within_submenu
do
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Dependency
L
ist'
)
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Dependency
l
ist'
)
end
end
end
...
...
@@ -25,7 +25,7 @@ module QA
def
click_on_threat_monitoring
hover_security_compliance
do
within_submenu
do
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Threat
M
onitoring'
)
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Threat
m
onitoring'
)
end
end
end
...
...
@@ -41,7 +41,7 @@ module QA
def
click_on_vulnerability_report
hover_security_compliance
do
within_submenu
do
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Vulnerability
R
eport'
)
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Vulnerability
r
eport'
)
end
end
end
...
...
@@ -65,7 +65,7 @@ module QA
def
go_to_audit_events_settings
hover_security_compliance
do
within_submenu
do
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Audit
E
vents'
)
click_element
(
:sidebar_menu_item_link
,
menu_item:
'Audit
e
vents'
)
end
end
end
...
...
spec/support/shared_contexts/navbar_structure_context.rb
View file @
425ed71c
...
...
@@ -5,7 +5,7 @@ RSpec.shared_context 'project navbar structure' do
{
nav_item:
_
(
'Security & Compliance'
),
nav_sub_items:
[
(
_
(
'Audit
E
vents'
)
if
Gitlab
.
ee?
),
(
_
(
'Audit
e
vents'
)
if
Gitlab
.
ee?
),
_
(
'Configuration'
)
]
}
...
...
@@ -165,7 +165,7 @@ RSpec.shared_context 'group navbar structure' do
{
nav_item:
_
(
'Security & Compliance'
),
nav_sub_items:
[
_
(
'Audit
E
vents'
)
_
(
'Audit
e
vents'
)
]
}
end
...
...
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