summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-03-08 08:28:19 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-03-08 08:28:19 +0000
commit6648188121ba8c044f104ff491a3b20a53167c64 (patch)
tree02b1f54421fd70bfe20b268f9314a8863deccca0
parent207d31002ea980ced4e106a3ab79fa2a6fd21047 (diff)
parent90311109ea9e08848428cff3e78c54a265f2044d (diff)
downloadgitlab-ce-6648188121ba8c044f104ff491a3b20a53167c64.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
-rw-r--r--app/controllers/projects/settings/operations_controller.rb5
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