summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorAdriel Santiago <asantiago@gitlab.com>2019-05-07 14:47:09 +0000
committerClement Ho <clemmakesapps@gmail.com>2019-05-07 14:47:09 +0000
commit3565ee2ed66bd064ab6bef96ab43c0be43f75e49 (patch)
tree8a636b3d3eea34911e84979f93bc111ee1a7d984 /app/controllers
parent4ebfcd3b8fa69d7b0ccd2b826a517a18fad07eea (diff)
downloadgitlab-ce-3565ee2ed66bd064ab6bef96ab43c0be43f75e49.tar.gz
Add external dashboard link
Add settings for linking to external dashboard from metrics dashboard
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/environments_controller.rb1
-rw-r--r--app/controllers/projects/settings/operations_controller.rb4
2 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index d8812c023ca..5a4adea497b 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -14,6 +14,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
push_frontend_feature_flag(:metrics_time_window)
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)
end
def index
diff --git a/app/controllers/projects/settings/operations_controller.rb b/app/controllers/projects/settings/operations_controller.rb
index 5cfb0ac307d..b5c77e5bbf4 100644
--- a/app/controllers/projects/settings/operations_controller.rb
+++ b/app/controllers/projects/settings/operations_controller.rb
@@ -5,6 +5,10 @@ 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