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
b9839862
Commit
b9839862
authored
Apr 30, 2020
by
Ryan Cobb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix settings-path path
parent
063cafcc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/helpers/environments_helper.rb
app/helpers/environments_helper.rb
+2
-2
No files found.
app/helpers/environments_helper.rb
View file @
b9839862
...
...
@@ -26,7 +26,7 @@ module EnvironmentsHelper
metrics_data
.
merge!
(
project_metrics_data
(
project
))
if
project
metrics_data
.
merge!
(
environment_metrics_data
(
environment
))
if
environment
metrics_data
.
merge!
(
project_and_environment_metrics_data
(
project
,
environment
))
if
project
&&
environment
metrics_data
.
merge!
(
static_data
)
metrics_data
.
merge!
(
static_
metrics_
data
)
metrics_data
end
...
...
@@ -50,7 +50,7 @@ module EnvironmentsHelper
return
{}
unless
project
{
'settings-path'
=>
edit_project_service_path
(
project
),
'settings-path'
=>
edit_project_service_path
(
project
,
'prometheus'
),
'clusters-path'
=>
project_clusters_path
(
project
),
'dashboards-endpoint'
=>
project_performance_monitoring_dashboards_path
(
project
,
format: :json
),
'default-branch'
=>
project
.
default_branch
,
...
...
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