Commit bd2aa832 authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch '239472-swimlanes-license' into 'master'

Add swimlanes to premium license

See merge request gitlab-org/gitlab!41543
parents c182f7ae ecd5854d
...@@ -9,7 +9,7 @@ module BoardsActions ...@@ -9,7 +9,7 @@ module BoardsActions
before_action :boards, only: :index before_action :boards, only: :index
before_action :board, only: :show before_action :board, only: :show
before_action :push_wip_limits, only: [:index, :show] before_action :push_licensed_features, only: [:index, :show]
before_action do before_action do
push_frontend_feature_flag(:not_issuable_queries, parent, default_enabled: true) push_frontend_feature_flag(:not_issuable_queries, parent, default_enabled: true)
end end
...@@ -29,7 +29,7 @@ module BoardsActions ...@@ -29,7 +29,7 @@ module BoardsActions
private private
# Noop on FOSS # Noop on FOSS
def push_wip_limits def push_licensed_features
end end
def boards def boards
......
...@@ -10,9 +10,10 @@ module EE ...@@ -10,9 +10,10 @@ module EE
private private
def push_wip_limits def push_licensed_features
# This is pushing a licensed Feature to the frontend. # This is pushing a licensed Feature to the frontend.
push_frontend_feature_flag(:wip_limits, type: :licensed, default_enabled: true) if parent.feature_available?(:wip_limits) push_frontend_feature_flag(:wip_limits, type: :licensed, default_enabled: true) if parent.feature_available?(:wip_limits)
push_frontend_feature_flag(:swimlanes, type: :licensed, default_enabled: true) if parent.feature_available?(:swimlanes)
end end
end end
end end
...@@ -6,7 +6,7 @@ module EE ...@@ -6,7 +6,7 @@ module EE
extend ::Gitlab::Utils::Override extend ::Gitlab::Utils::Override
included do included do
before_action :push_wip_limits before_action :push_licensed_features
end end
EE_MAX_LIMITS_PARAMS = %i[max_issue_count max_issue_weight limit_metric].freeze EE_MAX_LIMITS_PARAMS = %i[max_issue_count max_issue_weight limit_metric].freeze
......
...@@ -108,6 +108,7 @@ class License < ApplicationRecord ...@@ -108,6 +108,7 @@ class License < ApplicationRecord
required_ci_templates required_ci_templates
scoped_labels scoped_labels
smartcard_auth smartcard_auth
swimlanes
group_timelogs group_timelogs
type_of_work_analytics type_of_work_analytics
minimal_access_role minimal_access_role
......
---
name: swimlanes
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41543
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/239472
group: group::portfolio management
type: licensed
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