diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-13 12:06:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-13 12:06:41 +0300 |
| commit | 4f01ac5ba0bf72427ed4fef9b229d056dbb60e89 (patch) | |
| tree | 55f2bfd319a18c05ac4e4401c7a0d7b13dd3d74f /app/controllers/projects/grafana_api_controller.rb | |
| parent | 213ce7805856f2cc1d019a03c76ae0d098337c26 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/grafana_api_controller.rb')
| -rw-r--r-- | app/controllers/projects/grafana_api_controller.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/controllers/projects/grafana_api_controller.rb b/app/controllers/projects/grafana_api_controller.rb index 85f47b92e58..380a18818ab 100644 --- a/app/controllers/projects/grafana_api_controller.rb +++ b/app/controllers/projects/grafana_api_controller.rb @@ -4,8 +4,6 @@ class Projects::GrafanaApiController < Projects::ApplicationController include RenderServiceResults include MetricsDashboard - before_action :validate_feature_enabled!, only: [:metrics_dashboard] - def proxy result = ::Grafana::ProxyService.new( project, @@ -26,10 +24,6 @@ class Projects::GrafanaApiController < Projects::ApplicationController params.permit(:embedded, :grafana_url) end - def validate_feature_enabled! - render_403 unless Feature.enabled?(:gfm_grafana_integration) - end - def query_params params.permit(:query, :start, :end, :step) end |