From 0797b9455bdc720a69264f93b3475bdbac76b63f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= Date: Fri, 8 Mar 2019 08:28:19 +0000 Subject: [PATCH] Merge branch '4925-open-issues-based-on-prometheus-alerts-controller-ce' into 'master' Remove unnecessary license check in operations controller See merge request gitlab-org/gitlab-ce!25728 (cherry picked from commit 6648188121ba8c044f104ff491a3b20a53167c64) 44f3dc5b Remove unnecessary license check --- app/controllers/projects/settings/operations_controller.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/controllers/projects/settings/operations_controller.rb b/app/controllers/projects/settings/operations_controller.rb index 7276964b6e1..1fafc33e917 100644 --- a/app/controllers/projects/settings/operations_controller.rb +++ b/app/controllers/projects/settings/operations_controller.rb @@ -3,7 +3,6 @@ module Projects module Settings class OperationsController < Projects::ApplicationController - before_action :check_license before_action :authorize_update_environment! helper_method :error_tracking_setting @@ -65,10 +64,6 @@ module Projects ] } end - - def check_license - render_404 unless helpers.settings_operations_available? - end end end end -- GitLab