Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-09 12:09:27 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-09 12:09:27 +0300
commitc3b45354d720654215eb0e7b8e718ba6ea2d7a96 (patch)
tree359066e91bad08ae8e404bb43316705b7b53993e /app/helpers/environments_helper.rb
parent734708924b0f86ad3c23636bd6a8942d679daaf2 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/environments_helper.rb')
-rw-r--r--app/helpers/environments_helper.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/helpers/environments_helper.rb b/app/helpers/environments_helper.rb
index 4e5d12de8d3..8dbbec8c21d 100644
--- a/app/helpers/environments_helper.rb
+++ b/app/helpers/environments_helper.rb
@@ -84,8 +84,9 @@ module EnvironmentsHelper
'metrics-endpoint' => additional_metrics_project_environment_path(project, environment, format: :json),
'dashboard-endpoint' => metrics_dashboard_project_environment_path(project, environment, format: :json),
'deployments-endpoint' => project_environment_deployments_path(project, environment, format: :json),
- 'alerts-endpoint' => project_prometheus_alerts_path(project, environment_id: environment.id, format: :json)
-
+ 'alerts-endpoint' => project_prometheus_alerts_path(project, environment_id: environment.id, format: :json),
+ 'operations-settings-path' => project_settings_operations_path(project),
+ 'can-access-operations-settings' => can?(current_user, :admin_operations, project).to_s
}
end