Skip to content

Bugfix - Revert subscription banner revert and provide bugfix

Jay requested to merge jswain_revert_revert_subscription_banner into master

What does this MR do?

decorated_subscription is expected to return nil when there is no subscription. It was previously returning an empty SubscriptionDecorator object and caused breakage.

This change corrects the behavior, in tune with what the Gitlab::ExpiringSubscriptionMessage expects.

The actual bugfix is this commit: 35d89df9

The other 2 are in related to the reverts.

This is part of: #214212 (closed)

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team
Edited by Jan Provaznik

Merge request reports

Loading