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
8d40d296
Commit
8d40d296
authored
Apr 21, 2020
by
rpereira2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use override utility in EE::EnvironmentsHelper
parent
a8855bb7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
app/helpers/environments_helper.rb
app/helpers/environments_helper.rb
+2
-1
ee/app/helpers/ee/environments_helper.rb
ee/app/helpers/ee/environments_helper.rb
+5
-0
No files found.
app/helpers/environments_helper.rb
View file @
8d40d296
...
...
@@ -2,7 +2,6 @@
module
EnvironmentsHelper
include
ActionView
::
Helpers
::
AssetUrlHelper
prepend_if_ee
(
'::EE::EnvironmentsHelper'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
def
environments_list_data
{
...
...
@@ -65,3 +64,5 @@ module EnvironmentsHelper
can?
(
current_user
,
:destroy_environment
,
environment
)
end
end
EnvironmentsHelper
.
prepend_if_ee
(
'::EE::EnvironmentsHelper'
)
ee/app/helpers/ee/environments_helper.rb
View file @
8d40d296
...
...
@@ -2,6 +2,9 @@
module
EE
module
EnvironmentsHelper
extend
::
Gitlab
::
Utils
::
Override
override
:environments_list_data
def
environments_list_data
ee_environments_list_data
=
{
"canary_deployment_feature_id"
=>
UserCalloutsHelper
::
CANARY_DEPLOYMENT
,
...
...
@@ -14,6 +17,7 @@ module EE
super
.
merge
(
ee_environments_list_data
)
end
override
:environments_folder_list_view_data
def
environments_folder_list_view_data
ee_environments_folder_list_view_data
=
{
"canary_deployment_feature_id"
=>
UserCalloutsHelper
::
CANARY_DEPLOYMENT
,
...
...
@@ -26,6 +30,7 @@ module EE
super
.
merge
(
ee_environments_folder_list_view_data
)
end
override
:metrics_data
def
metrics_data
(
project
,
environment
)
ee_metrics_data
=
{}
ee_metrics_data
[
"logs_path"
]
=
project_logs_path
(
project
,
environment_name:
environment
.
name
)
if
can?
(
current_user
,
:read_pod_logs
,
project
)
...
...
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