Skip to content
Snippets Groups Projects
Commit 4f56ffdc authored by Serena Fang's avatar Serena Fang Committed by Mayra Cabrera
Browse files

Remove banner about free project changes

Changelog: changed
parent 3b48b7a8
No related branches found
No related tags found
1 merge request!91533Remove banner about free project changes
Showing with 3 additions and 103 deletions
......@@ -9,7 +9,6 @@ module CalloutsHelper
FEATURE_FLAGS_NEW_VERSION = 'feature_flags_new_version'
REGISTRATION_ENABLED_CALLOUT = 'registration_enabled_callout'
UNFINISHED_TAG_CLEANUP_CALLOUT = 'unfinished_tag_cleanup_callout'
MINUTE_LIMIT_BANNER = 'minute_limit_banner'
SECURITY_NEWSLETTER_CALLOUT = 'security_newsletter_callout'
REGISTRATION_ENABLED_CALLOUT_ALLOWED_CONTROLLER_PATHS = [/^root/, /^dashboard\S*/, /^admin\S*/].freeze
......@@ -61,10 +60,6 @@ def show_security_newsletter_user_callout?
!user_dismissed?(SECURITY_NEWSLETTER_CALLOUT)
end
def minute_limit_banner_dismissed?
user_dismissed?(MINUTE_LIMIT_BANNER)
end
private
def user_dismissed?(feature_name, ignore_dismissal_earlier_than = nil)
......
......@@ -49,7 +49,9 @@ class Callout < ApplicationRecord
storage_enforcement_banner_fourth_enforcement_threshold: 46,
attention_requests_top_nav: 47,
attention_requests_side_nav: 48,
minute_limit_banner: 49,
# 49 was removed with https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91533
# because the banner was no longer relevant.
# Records will be migrated with https://gitlab.com/gitlab-org/gitlab/-/issues/367293
preview_user_over_limit_free_plan_alert: 50, # EE-only
user_reached_limit_free_plan_alert: 51, # EE-only
submit_license_usage_data_banner: 52, # EE-only
......
- page_title _("Activity")
= render_if_exists 'shared/minute_limit_banner', namespace: @project
= render 'projects/last_push'
= render 'projects/activity'
......@@ -5,8 +5,6 @@
- expanded = expanded_by_default?
- reduce_visibility_form_id = 'reduce-visibility-form'
= render_if_exists 'shared/minute_limit_banner', namespace: @project
%section.settings.general-settings.no-animate.expanded#js-general-settings
.settings-header
%h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Naming, topics, avatar')
......
......@@ -4,7 +4,6 @@
- subscribed = params[:subscribed]
- labels_or_filters = @labels.exists? || @prioritized_labels.exists? || search.present? || subscribed.present?
= render_if_exists 'shared/minute_limit_banner', namespace: @project
- if labels_or_filters
#js-promote-label-modal
= render 'shared/labels/nav', labels_or_filters: labels_or_filters, can_admin_label: can_admin_label
......
......@@ -2,7 +2,6 @@
- page_title _("Members")
= render_if_exists 'projects/free_user_cap_alert', project: @project
= render_if_exists 'shared/minute_limit_banner', namespace: @project
.row.gl-mt-3
.col-lg-12
......
......@@ -7,7 +7,6 @@
= auto_discovery_link_tag(:atom, project_path(@project, rss_url_options), title: "#{@project.name} activity")
= render_if_exists 'projects/free_user_cap_alert', project: @project
= render_if_exists 'shared/minute_limit_banner', namespace: @project
= render partial: 'flash_messages', locals: { project: @project }
= render 'clusters_deprecation_alert'
......
---
name: show_minute_limit_banner
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84644
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358191
milestone: '14.10'
type: development
group: group::workspace
default_enabled: false
......@@ -20159,7 +20159,6 @@ Name of the feature that the callout is for.
| <a id="usercalloutfeaturenameenumgeo_migrate_hashed_storage"></a>`GEO_MIGRATE_HASHED_STORAGE` | Callout feature name for geo_migrate_hashed_storage. |
| <a id="usercalloutfeaturenameenumgke_cluster_integration"></a>`GKE_CLUSTER_INTEGRATION` | Callout feature name for gke_cluster_integration. |
| <a id="usercalloutfeaturenameenumgold_trial_billings"></a>`GOLD_TRIAL_BILLINGS` | Callout feature name for gold_trial_billings. |
| <a id="usercalloutfeaturenameenumminute_limit_banner"></a>`MINUTE_LIMIT_BANNER` | Callout feature name for minute_limit_banner. |
| <a id="usercalloutfeaturenameenummr_experience_survey"></a>`MR_EXPERIENCE_SURVEY` | Callout feature name for mr_experience_survey. |
| <a id="usercalloutfeaturenameenumnew_user_signups_cap_reached"></a>`NEW_USER_SIGNUPS_CAP_REACHED` | Callout feature name for new_user_signups_cap_reached. |
| <a id="usercalloutfeaturenameenumpersonal_access_token_expiry"></a>`PERSONAL_ACCESS_TOKEN_EXPIRY` | Callout feature name for personal_access_token_expiry. |
......@@ -61,14 +61,6 @@ def buy_storage_url(namespace)
buy_storage_subscriptions_url(selected_group: namespace.root_ancestor.id)
end
def show_minute_limit_banner?(namespace)
return false unless ::Gitlab.com? &&
::Feature.enabled?(:show_minute_limit_banner, namespace.root_ancestor) &&
current_user&.can?(:guest_access, namespace.root_ancestor)
namespace.root_ancestor.has_free_or_no_subscription? && !minute_limit_banner_dismissed?
end
override :pipeline_usage_app_data
def pipeline_usage_app_data(namespace)
return super unless ::Gitlab::CurrentSettings.should_check_namespace_plan?
......
- if show_minute_limit_banner?(namespace)
.container-fluid
.row
= render Pajamas::AlertComponent.new(title: s_("Changes to free tier open source projects"),
alert_options: { class: 'gl-mt-5 js-minute-limit-banner',
data: { feature_id: ::Users::CalloutsHelper::MINUTE_LIMIT_BANNER, dismiss_endpoint: callouts_path }}) do |c|
= c.body do
- enrollment_link = external_link("enroll in the GitLab for Open Source Program", "https://about.gitlab.com/blog/2022/02/04/ultimate-perks-for-open-source-projects")
- faq_link = external_link("FAQ", "https://about.gitlab.com/pricing/faq-efficient-free-tier/#public-projects-on-gitlab-saas-free-tier")
= s_("Before July 1, 2022, all free tier public open source projects must %{enrollment_link} to continue to receive GitLab Ultimate benefits.").html_safe % { enrollment_link: enrollment_link }
%br
%br
= s_("For more information, see the %{faq_link}.").html_safe % { faq_link: faq_link }
......@@ -270,58 +270,6 @@
end
end
describe '#show_minute_limit_banner?' do
let(:project) { create(:project) }
context 'on dot com' do
using RSpec::Parameterized::TableSyntax
where(:feature_flag_enabled, :has_guest_access, :free_plan, :user_dismissed_banner, :should_show_banner) do
true | true | true | false | true
false | true | true | true | false
false | false | true | true | false
false | false | false | true | false
false | false | false | false | false
false | true | false | true | false
false | false | false | true | false
true | true | true | true | false
true | true | false | false | false
true | false | false | false | false
true | true | false | true | false
true | false | false | true | false
end
with_them do
before do
allow(Gitlab).to receive(:com?).and_return(true)
stub_feature_flags(show_minute_limit_banner: feature_flag_enabled)
allow(helper).to receive(:current_user).and_return(user)
allow(user).to receive(:can?).with(:guest_access, project.root_ancestor).and_return(has_guest_access)
allow(project.root_ancestor).to receive(:has_free_or_no_subscription?).and_return(free_plan)
allow(helper).to receive(:user_dismissed?).with('minute_limit_banner').and_return(user_dismissed_banner)
end
it 'shows the banner if required' do
expect(helper.show_minute_limit_banner?(project)).to eq(should_show_banner)
end
end
end
context 'not dot com' do
context 'when feature flag is enabled for a free project and user has not dismissed callout' do
before do
stub_feature_flags(show_minute_limit_banner: true)
allow(project.root_ancestor).to receive(:free_plan?).and_return(true)
allow(helper).to receive(:user_dismissed?).with('minute_limit_banner').and_return(false)
end
it 'does not show banner' do
expect(helper.show_minute_limit_banner?(project)).to eq(false)
end
end
end
end
describe '#pipeline_usage_app_data' do
context 'when gitlab sass', :saas do
let(:minutes_usage) { user_group.ci_minutes_usage }
......
......@@ -5856,9 +5856,6 @@ msgstr ""
msgid "Be careful. Renaming a project's repository can have unintended side effects."
msgstr ""
 
msgid "Before July 1, 2022, all free tier public open source projects must %{enrollment_link} to continue to receive GitLab Ultimate benefits."
msgstr ""
msgid "Before enabling this integration, create a webhook for the room in Google Chat where you want to receive notifications from this project. %{docs_link}"
msgstr ""
 
......@@ -7532,9 +7529,6 @@ msgstr ""
msgid "Changes the title to \"%{title_param}\"."
msgstr ""
 
msgid "Changes to free tier open source projects"
msgstr ""
msgid "Changes to the title have not been saved"
msgstr ""
 
......@@ -16521,9 +16515,6 @@ msgstr ""
msgid "For more information, go to the "
msgstr ""
 
msgid "For more information, see the %{faq_link}."
msgstr ""
msgid "For more information, see the File Hooks documentation."
msgstr ""
 
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment