Skip to content
Snippets Groups Projects
Verified Commit 57959d7b authored by Eduardo Bonet's avatar Eduardo Bonet :speech_balloon: Committed by GitLab
Browse files

Merge branch '462434-ff-cleanup-add_gitlab_tier_cookie' into 'master'

Clean up feature flag add_gitlab_tier_cookie

See merge request !160651



Merged-by: Eduardo Bonet's avatarEduardo Bonet <ebonet@gitlab.com>
Approved-by: Jon Jenkins's avatarJon Jenkins <jjenkins@gitlab.com>
Approved-by: Eduardo Bonet's avatarEduardo Bonet <ebonet@gitlab.com>
Co-authored-by: default avatarrliu-gl <rliu@gitlab.com>
parents 500452e1 aa42f38d
No related branches found
No related tags found
4 merge requests!162538Backport 17-2: Handle empty ff merge in from train ref strategy,!162537Backport 17-1: Handle empty ff merge in from train ref strategy,!162233Draft: Script to update Topology Service Gem,!160651Clean up feature flag add_gitlab_tier_cookie
Pipeline #1391917430 failed
Pipeline: E2E Omnibus GitLab EE

#1391926235

    Pipeline: E2E CNG

    #1391926193

      Pipeline: E2E GDK

      #1391921603

        +29
        ......@@ -16,8 +16,6 @@ def set_marketing_user_cookies(auth, user)
        expires: expiration_time
        }
        return if ::Feature.disabled?(:add_gitlab_tier_cookie, ::Feature.current_request)
        tiers = GitlabSubscriptions::CurrentActivePlansForUserFinder.new(user).execute.pluck(:name) # rubocop:disable Database/AvoidUsingPluckWithoutLimit -- False positive as limit is defined in finder
        auth.cookies[:gitlab_tier] = {
        ......
        ---
        name: add_gitlab_tier_cookie
        feature_issue_url: https://gitlab.com/gitlab-com/marketing/digital-experience/buyer-experience/-/issues/2875
        introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151323
        rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462434
        milestone: '17.1'
        group: group::dex
        type: gitlab_com_derisk
        default_enabled: false
        ......@@ -51,19 +51,6 @@
        expect(auth.cookies[:gitlab_tier][:value]).to eq %w[free ultimate]
        end
        end
        context 'when the add_gitlab_tier_cookie feature flag is disabled' do
        before do
        stub_feature_flags(add_gitlab_tier_cookie: false)
        end
        it 'does not set the tier cookie' do
        described_class.set_marketing_user_cookies(auth, user)
        expect(auth.cookies[:gitlab_user]).to be_present
        expect(auth.cookies[:gitlab_tier]).to be_nil
        end
        end
        end
        context 'when the gitlab_com_subscriptions saas feature is not available' do
        ......
        ......@@ -41,19 +41,6 @@
        expect(response.cookies['gitlab_tier']).to be_present
        end
        end
        context 'when the add_gitlab_tier_cookie feature flag is disabled' do
        before do
        stub_feature_flags(add_gitlab_tier_cookie: false)
        end
        it 'does not set the tier cookie' do
        post user_session_path(user: { login: user.username, password: user.password })
        expect(response.cookies['gitlab_user']).to be_present
        expect(response.cookies['gitlab_tier']).to be_nil
        end
        end
        end
        context 'when the gitlab_com_subscriptions saas feature is not available' do
        ......
        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