An error occurred while fetching the assigned milestone of the selected merge_request.
BE: Allow customers to extend or reactivate their trial on gitlab.com [RUN ALL RSPEC] [RUN AS-IF-FOSS]
All threads resolved!
Compare changes
Files
5+ 15
− 13
@@ -9,7 +9,7 @@ class TrialsController < ApplicationController
@@ -9,7 +9,7 @@ class TrialsController < ApplicationController
@@ -52,17 +52,7 @@ def apply
@@ -52,17 +52,7 @@ def apply
return render_403 unless [GitlabSubscription::TRIAL_EXTENDED, GitlabSubscription::TRIAL_REACTIVATED].include?(trial_extension_type)
return render_403 if trial_extension_type == GitlabSubscription::TRIAL_EXTENDED && !@namespace.can_extend?
return render_403 if trial_extension_type == GitlabSubscription::TRIAL_REACTIVATED && !@namespace.can_reactivate?
@result = GitlabSubscriptions::ExtendReactivateTrialService.new.execute(extend_reactivate_trial_params)
@@ -86,7 +76,7 @@ def authenticate_user!
@@ -86,7 +76,7 @@ def authenticate_user!
@@ -147,6 +137,18 @@ def find_namespace?
@@ -147,6 +137,18 @@ def find_namespace?