Commit 9ac5ac08 authored by Gabriel Mazetto's avatar Gabriel Mazetto

Merge branch 'remove-ff-denied-lc' into 'master'

Remove FF for License Compliance rule

See merge request gitlab-org/gitlab!43577
parents 154b4a49 bd9e8986
...@@ -4,9 +4,6 @@ module Projects ...@@ -4,9 +4,6 @@ module Projects
class LicensesController < Projects::ApplicationController class LicensesController < Projects::ApplicationController
before_action :authorize_read_licenses!, only: [:index] before_action :authorize_read_licenses!, only: [:index]
before_action :authorize_admin_software_license_policy!, only: [:create, :update] before_action :authorize_admin_software_license_policy!, only: [:create, :update]
before_action do
push_frontend_feature_flag(:license_compliance_denies_mr, default_enabled: true)
end
def index def index
respond_to do |format| respond_to do |format|
......
...@@ -143,7 +143,6 @@ module EE ...@@ -143,7 +143,6 @@ module EE
end end
def has_denied_policies? def has_denied_policies?
return false if ::Feature.disabled?(:license_compliance_denies_mr, project, default_enabled: true)
return false unless has_license_scanning_reports? return false unless has_license_scanning_reports?
return false if has_approved_license_check? return false if has_approved_license_check?
......
---
name: license_compliance_denies_mr
introduced_by_url:
rollout_issue_url:
group: composition_analysis
type: development
default_enabled: true
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment