summaryrefslogtreecommitdiff
path: root/app/controllers/projects/settings
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2019-06-17 15:22:44 -0300
committerFelipe Artur <felipefac@gmail.com>2019-06-17 15:22:44 -0300
commitd9df2f730b4eaab4e2d1b5f5045e34bb14e3486f (patch)
tree050490a4e90601ad4d175ba6674b98f35937587e /app/controllers/projects/settings
parent66b9ca952aa4104f99c1275566e8b5c7d28fce01 (diff)
parentd2929d6edb3a04054a5218cb1b21cb0759ec1ec8 (diff)
downloadgitlab-ce-issue_60515.tar.gz
Merge branch 'master' into issue_60515issue_60515
Diffstat (limited to 'app/controllers/projects/settings')
-rw-r--r--app/controllers/projects/settings/operations_controller.rb4
1 files changed, 0 insertions, 4 deletions
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