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
b4b2b810
Commit
b4b2b810
authored
Jan 12, 2022
by
Tetiana Chupryna
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Workaround instance variable issue
parent
1b238156
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
12 deletions
+7
-12
app/controllers/projects/security/configuration_controller.rb
...controllers/projects/security/configuration_controller.rb
+5
-5
ee/app/controllers/ee/projects/security/configuration_controller.rb
...trollers/ee/projects/security/configuration_controller.rb
+2
-7
No files found.
app/controllers/projects/security/configuration_controller.rb
View file @
b4b2b810
...
@@ -21,7 +21,7 @@ module Projects
...
@@ -21,7 +21,7 @@ module Projects
private
private
def
configuration
def
configuration
@configuration
||=
if
unify_configuration_enabled?
if
unify_configuration_enabled?
configuration_presenter
configuration_presenter
else
else
{}
{}
...
...
ee/app/controllers/ee/projects/security/configuration_controller.rb
View file @
b4b2b810
...
@@ -32,12 +32,12 @@ module EE
...
@@ -32,12 +32,12 @@ module EE
def
show
def
show
return
super
unless
security_dashboard_feature_enabled?
&&
can_read_security_dashboard?
return
super
unless
security_dashboard_feature_enabled?
&&
can_read_security_dashboard?
configuration
@configuration
||=
configuration_presenter
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
format
.
json
do
format
.
json
do
render
status: :ok
,
json:
configuration
.
to_h
render
status: :ok
,
json:
@
configuration
.
to_h
end
end
end
end
end
end
...
@@ -76,11 +76,6 @@ module EE
...
@@ -76,11 +76,6 @@ module EE
render_404
if
::
Feature
.
disabled?
(
:security_auto_fix
,
project
)
render_404
if
::
Feature
.
disabled?
(
:security_auto_fix
,
project
)
end
end
override
:configuration
def
configuration
@configuration
||=
configuration_presenter
end
def
security_dashboard_feature_enabled?
def
security_dashboard_feature_enabled?
vulnerable
.
feature_available?
(
:security_dashboard
)
vulnerable
.
feature_available?
(
:security_dashboard
)
end
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