summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyasonik <syasonik@gitlab.com>2019-07-16 15:50:40 +0300
committersyasonik <syasonik@gitlab.com>2019-07-16 15:50:40 +0300
commitf8a20582ec968f5dfdd905f7931b80e4ba8c3b68 (patch)
tree06317045e6dd6aaf6d5575d5f306acc79e51c198
parent35bd1a351da69ec8a9f7cfb30857a7a34ea9049c (diff)
downloadgitlab-ce-unlink-metrics-feature-flags.tar.gz
Allow dashboard endpoint to be used even if env metrics don't use itunlink-metrics-feature-flags
-rw-r--r--app/controllers/projects/environments_controller.rb2
-rw-r--r--spec/controllers/projects/environments_controller_spec.rb12
2 files changed, 0 insertions, 14 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index fe54913c03b..ccd54b369fa 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -160,8 +160,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
end
def metrics_dashboard
- return render_403 unless Feature.enabled?(:environment_metrics_use_prometheus_endpoint, project)
-
if Feature.enabled?(:gfm_embedded_metrics, project) && params[:embedded]
result = dashboard_finder.find(
project,
diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index 2fccf433223..ebbbebf1bc0 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -627,18 +627,6 @@ describe Projects::EnvironmentsController do
it_behaves_like 'dashboard cannot be specified'
it_behaves_like 'dashboard cannot be embedded'
end
-
- context 'when prometheus endpoint is disabled' do
- before do
- stub_feature_flags(environment_metrics_use_prometheus_endpoint: false)
- end
-
- it 'responds with status code 403' do
- get :metrics_dashboard, params: environment_params(dashboard_params)
-
- expect(response).to have_gitlab_http_status(:forbidden)
- end
- end
end
describe 'GET #search' do