diff options
author | Kamil TrzciĆski <ayufan@ayufan.eu> | 2019-03-08 08:28:19 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-19 13:56:06 +0000 |
commit | 0797b9455bdc720a69264f93b3475bdbac76b63f (patch) | |
tree | 8aa662b0e9aafbe83964ffce4798c4b989c30524 | |
parent | 60d4d220231a767c6049d9f60a8a4b54f34325e2 (diff) | |
download | gitlab-ce-0797b9455bdc720a69264f93b3475bdbac76b63f.tar.gz |
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
-rw-r--r-- | app/controllers/projects/settings/operations_controller.rb | 5 |
1 files changed, 0 insertions, 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 |