diff options
| author | Reuben Pereira <rpereira@gitlab.com> | 2019-06-12 22:20:22 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-06-12 22:20:22 +0300 |
| commit | a4e320a42c1d1b973719e27e0ebc9fc96c173a03 (patch) | |
| tree | 007779f6b7e74f293ad73212629b8617fc4a4fdd /app | |
| parent | b98633ade38bb75d750608f422c9fbc4b4080909 (diff) | |
Remove the grafana_dashboard_link feature flag
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/operation_settings/index.js | 8 | ||||
| -rw-r--r-- | app/controllers/projects/environments_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/settings/operations_controller.rb | 4 |
3 files changed, 0 insertions, 13 deletions
diff --git a/app/assets/javascripts/operation_settings/index.js b/app/assets/javascripts/operation_settings/index.js index 6946578e6d2..f075291ce98 100644 --- a/app/assets/javascripts/operation_settings/index.js +++ b/app/assets/javascripts/operation_settings/index.js @@ -3,14 +3,6 @@ import store from './store'; import ExternalDashboardForm from './components/external_dashboard.vue'; export default () => { - /** - * This check can be removed when we remove - * the :grafana_dashboard_link feature flag - */ - if (!gon.features.grafanaDashboardLink) { - return null; - } - const el = document.querySelector('.js-operation-settings'); return new Vue({ diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index e002a4d349b..08a0647f6b2 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -13,7 +13,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController before_action only: [:metrics, :additional_metrics, :metrics_dashboard] do push_frontend_feature_flag(:environment_metrics_use_prometheus_endpoint) push_frontend_feature_flag(:environment_metrics_show_multiple_dashboards) - push_frontend_feature_flag(:grafana_dashboard_link) push_frontend_feature_flag(:prometheus_computed_alerts) end diff --git a/app/controllers/projects/settings/operations_controller.rb b/app/controllers/projects/settings/operations_controller.rb index b5c77e5bbf4..5cfb0ac307d 100644 --- a/app/controllers/projects/settings/operations_controller.rb +++ b/app/controllers/projects/settings/operations_controller.rb @@ -5,10 +5,6 @@ module Projects class OperationsController < Projects::ApplicationController before_action :authorize_update_environment! - before_action do - push_frontend_feature_flag(:grafana_dashboard_link) - end - helper_method :error_tracking_setting def show |