Skip to content
Snippets Groups Projects
Commit 200930fe authored by Bob Van Landuyt :neckbeard:'s avatar Bob Van Landuyt :neckbeard: :sunglasses:
Browse files

Merge branch 'samgerrorbudgetfulfilpuirchaseoptin' into 'master'

Update fulfillment:purchase endpoint urgency for new error budget opt in

See merge request gitlab-org/gitlab!87588
parents 6af55259 e1e9fa61
No related branches found
No related tags found
No related merge requests found
Showing with 14 additions and 4 deletions
Loading
Loading
@@ -6,6 +6,7 @@ class ProxyController < ApplicationController
skip_before_action :verify_authenticity_token
 
feature_category :purchase
urgency :low
 
def graphql
response = Gitlab::HTTP.post(EE::SUBSCRIPTIONS_GRAPHQL_URL,
Loading
Loading
Loading
Loading
@@ -11,6 +11,7 @@ class Groups::BillingsController < Groups::ApplicationController
layout 'group_settings'
 
feature_category :purchase
urgency :low
 
def index
@hide_search_settings = true
Loading
Loading
Loading
Loading
@@ -8,6 +8,7 @@ class Groups::SeatUsageController < Groups::ApplicationController
layout "group_settings"
 
feature_category :purchase
urgency :low
 
def show
respond_to do |format|
Loading
Loading
Loading
Loading
@@ -11,6 +11,7 @@ class Groups::UsageQuotasController < Groups::ApplicationController
layout 'group_settings'
 
feature_category :purchase
urgency :low
 
def index
@hide_search_settings = true
Loading
Loading
Loading
Loading
@@ -4,6 +4,7 @@ class Profiles::BillingsController < Profiles::ApplicationController
before_action :verify_namespace_plan_check_enabled
 
feature_category :purchase
urgency :low
 
def index
@hide_search_settings = true
Loading
Loading
Loading
Loading
@@ -4,6 +4,7 @@ class Profiles::UsageQuotasController < Profiles::ApplicationController
include OneTrustCSP
 
feature_category :purchase
urgency :low
 
before_action only: [:index] do
push_frontend_feature_flag(:gitlab_gtm_datalayer, type: :ops)
Loading
Loading
Loading
Loading
@@ -9,6 +9,7 @@ class GroupsController < ApplicationController
before_action :find_group
 
feature_category :purchase
urgency :low
 
def edit
end
Loading
Loading
Loading
Loading
@@ -16,6 +16,7 @@ class SubscriptionsController < ApplicationController
end
 
feature_category :purchase
urgency :low
 
content_security_policy do |p|
next if p.directives.blank?
Loading
Loading
Loading
Loading
@@ -19,6 +19,7 @@ class TrialsController < ApplicationController
end
 
feature_category :purchase
urgency :low
 
def new
end
Loading
Loading
Loading
Loading
@@ -9,6 +9,7 @@ class UpcomingReconciliations < ::API::Base
end
 
feature_category :purchase
urgency :low
 
namespace :internal do
resource :upcoming_reconciliations do
Loading
Loading
Loading
Loading
@@ -89,7 +89,7 @@ def update_namespace(namespace)
 
requires :start_date, type: Date, desc: 'The date when subscription was started'
end
post ":id/gitlab_subscription", feature_category: :purchase do
post ":id/gitlab_subscription", urgency: :low, feature_category: :purchase do
authenticated_as_admin!
 
namespace = find_namespace!(params[:id])
Loading
Loading
@@ -107,7 +107,7 @@ def update_namespace(namespace)
desc 'Returns the subscription for the namespace' do
success ::API::Entities::GitlabSubscription
end
get ":id/gitlab_subscription", feature_category: :purchase do
get ":id/gitlab_subscription", urgency: :low, feature_category: :purchase do
namespace = find_namespace!(params[:id])
authorize! :admin_namespace, namespace
 
Loading
Loading
@@ -120,7 +120,7 @@ def update_namespace(namespace)
params do
use :gitlab_subscription_optional_attributes
end
put ":id/gitlab_subscription", feature_category: :purchase do
put ":id/gitlab_subscription", urgency: :low, feature_category: :purchase do
authenticated_as_admin!
 
namespace = find_namespace!(params[:id])
Loading
Loading
Loading
Loading
@@ -1096,7 +1096,7 @@ def target_user
requires :credit_card_mask_number, type: String, desc: 'The last 4 digits of credit card number'
requires :credit_card_type, type: String, desc: 'The credit card network name'
end
put ":user_id/credit_card_validation", feature_category: :purchase do
put ":user_id/credit_card_validation", urgency: :low, feature_category: :purchase do
authenticated_as_admin!
 
user = find_user(params[:user_id])
Loading
Loading
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