summaryrefslogtreecommitdiff
path: root/app/controllers/projects/environments_controller.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-13 18:06:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-13 18:06:51 +0000
commit57e3d49fc0fb99f42ac178761fc6232715734020 (patch)
tree756c435c2f5ec85bb2781fe28789b6f63999aac7 /app/controllers/projects/environments_controller.rb
parent3318518149062e5d17105f2170bd7bd9647af415 (diff)
downloadgitlab-ce-57e3d49fc0fb99f42ac178761fc6232715734020.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/environments_controller.rb')
-rw-r--r--app/controllers/projects/environments_controller.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index e0da3d9b6c9..4562296cea0 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -13,8 +13,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
before_action :verify_api_request!, only: :terminal_websocket_authorize
before_action :expire_etag_cache, only: [:index]
before_action only: [:metrics, :additional_metrics, :metrics_dashboard] do
- push_frontend_feature_flag(:environment_metrics_use_prometheus_endpoint, default_enabled: true)
- push_frontend_feature_flag(:environment_metrics_additional_panel_types)
push_frontend_feature_flag(:prometheus_computed_alerts)
end