Commit 5f181b2d authored by Tiger's avatar Tiger Committed by Jose Vargas

Disable canary deployment user callout

parent e4167f1a
...@@ -16,10 +16,7 @@ module EE ...@@ -16,10 +16,7 @@ module EE
THREAT_MONITORING_INFO = 'threat_monitoring_info' THREAT_MONITORING_INFO = 'threat_monitoring_info'
def show_canary_deployment_callout?(project) def show_canary_deployment_callout?(project)
!user_dismissed?(CANARY_DEPLOYMENT) && false
show_promotions? &&
# use :canary_deployments if we create a feature flag for it in the future
!project.feature_available?(:deploy_board)
end end
def render_enable_hashed_storage_warning def render_enable_hashed_storage_warning
......
...@@ -141,10 +141,6 @@ RSpec.describe EE::UserCalloutsHelper do ...@@ -141,10 +141,6 @@ RSpec.describe EE::UserCalloutsHelper do
end end
context 'when user needs to upgrade to canary deployments' do context 'when user needs to upgrade to canary deployments' do
before do
allow(project).to receive(:feature_available?).with(:deploy_board).and_return(false)
end
context 'when user has dismissed' do context 'when user has dismissed' do
before do before do
allow(helper).to receive(:user_dismissed?).and_return(true) allow(helper).to receive(:user_dismissed?).and_return(true)
...@@ -158,17 +154,8 @@ RSpec.describe EE::UserCalloutsHelper do ...@@ -158,17 +154,8 @@ RSpec.describe EE::UserCalloutsHelper do
allow(helper).to receive(:user_dismissed?).and_return(false) allow(helper).to receive(:user_dismissed?).and_return(false)
end end
it { is_expected.to be_truthy } it { is_expected.to be_falsey }
end
end
context 'when user already has access to canary deployments' do
before do
allow(project).to receive(:feature_available?).with(:deploy_board).and_return(true)
allow(helper).to receive(:user_dismissed?).and_return(false)
end end
it { is_expected.to be_falsey }
end end
end end
......
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