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
21eb2cd3
Commit
21eb2cd3
authored
Dec 14, 2018
by
Olivier Gonzalez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove FF for group security dashboard history
Make the history always visible
parent
c5b4d351
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
32 deletions
+3
-32
ee/app/assets/javascripts/security_dashboard/components/app.vue
.../assets/javascripts/security_dashboard/components/app.vue
+2
-7
ee/app/controllers/groups/security/dashboard_controller.rb
ee/app/controllers/groups/security/dashboard_controller.rb
+0
-4
ee/app/controllers/groups/security/vulnerabilities_controller.rb
...controllers/groups/security/vulnerabilities_controller.rb
+0
-6
ee/app/views/groups/security/dashboard/show.html.haml
ee/app/views/groups/security/dashboard/show.html.haml
+1
-2
ee/spec/controllers/groups/security/vulnerabilities_controller_spec.rb
...ollers/groups/security/vulnerabilities_controller_spec.rb
+0
-13
No files found.
ee/app/assets/javascripts/security_dashboard/components/app.vue
View file @
21eb2cd3
...
...
@@ -79,9 +79,6 @@ export default {
html
:
true
,
};
},
chartFlagEnabled
()
{
return
gon
.
features
&&
gon
.
features
.
groupSecurityDashboardHistory
;
},
},
created
()
{
this
.
setVulnerabilitiesEndpoint
(
this
.
vulnerabilitiesEndpoint
);
...
...
@@ -119,10 +116,8 @@ export default {
</span>
</
template
>
<vulnerability-count-list
/>
<
template
v-if=
"chartFlagEnabled"
>
<h4
class=
"my-4"
>
{{
__
(
'
Vulnerability Chart
'
)
}}
</h4>
<vulnerability-chart
/>
</
template
>
<h4
class=
"my-4"
>
{{ __('Vulnerability Chart') }}
</h4>
<vulnerability-chart
/>
<h4
class=
"my-4"
>
{{ __('Vulnerability List') }}
</h4>
<security-dashboard-table
:dashboard-documentation=
"dashboardDocumentation"
...
...
ee/app/controllers/groups/security/dashboard_controller.rb
View file @
21eb2cd3
# frozen_string_literal: true
class
Groups::Security::DashboardController
<
Groups
::
Security
::
ApplicationController
layout
'group'
before_action
do
push_frontend_feature_flag
(
:group_security_dashboard_history
,
group
)
end
end
ee/app/controllers/groups/security/vulnerabilities_controller.rb
View file @
21eb2cd3
...
...
@@ -2,8 +2,6 @@
class
Groups::Security::VulnerabilitiesController
<
Groups
::
Security
::
ApplicationController
HISTORY_RANGE
=
3
.
months
before_action
:check_group_security_dashboard_history_feature_flag!
,
only:
[
:history
]
def
index
@vulnerabilities
=
group
.
latest_vulnerabilities
.
sast
# FIXME: workaround until https://gitlab.com/gitlab-org/gitlab-ee/issues/6240
...
...
@@ -35,8 +33,4 @@ class Groups::Security::VulnerabilitiesController < Groups::Security::Applicatio
end
end
end
def
check_group_security_dashboard_history_feature_flag!
render_404
unless
::
Feature
.
enabled?
(
:group_security_dashboard_history
,
group
,
default_enabled:
true
)
end
end
ee/app/views/groups/security/dashboard/show.html.haml
View file @
21eb2cd3
-
breadcrumb_title
_
(
"Security Dashboard"
)
-
page_title
_
(
"Security Dashboard"
)
-
vulnerabilities_history_endpoint
=
Feature
.
enabled?
(
:group_security_dashboard_history
,
@group
)
?
history_group_security_vulnerabilities_path
(
@group
)
:
''
#js-group-security-dashboard
{
data:
{
vulnerabilities_endpoint:
group_security_vulnerabilities_path
(
@group
),
vulnerabilities_summary_endpoint:
summary_group_security_vulnerabilities_path
(
@group
),
vulnerabilities_history_endpoint:
vulnerabilities_history_endpoint
,
vulnerabilities_history_endpoint:
history_group_security_vulnerabilities_path
(
@group
)
,
vulnerability_feedback_help_path:
help_page_path
(
"user/project/merge_requests/index"
,
anchor:
"interacting-with-security-reports-ultimate"
),
empty_state_svg_path:
image_path
(
'illustrations/security-dashboard-empty-state.svg'
),
dashboard_documentation:
help_page_path
(
'user/group/security_dashboard/index'
)
}
}
ee/spec/controllers/groups/security/vulnerabilities_controller_spec.rb
View file @
21eb2cd3
...
...
@@ -230,19 +230,6 @@ describe Groups::Security::VulnerabilitiesController do
end
end
context
'when group security dashboard history feature flag is disabled'
do
before
do
stub_licensed_features
(
security_dashboard:
true
)
stub_feature_flags
(
group_security_dashboard_history:
false
)
group
.
add_developer
(
user
)
end
it
'returns 404'
do
subject
expect
(
response
).
to
have_gitlab_http_status
(
404
)
end
end
context
'when security dashboard feature is enabled'
do
before
do
stub_licensed_features
(
security_dashboard:
true
)
...
...
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