Merge branch 'develop' into rethinking-copilot

enterprise/app/controllers/api/v1/accounts/custom_roles_controller.rb

@@ -6,12 +6,12 @@ class Api::V1::Accounts::CustomRolesController < Api::V1::Accounts::EnterpriseAc
     @custom_roles = Current.account.custom_roles
   end
 
+  def show; end
+
   def create
     @custom_role = Current.account.custom_roles.create!(permitted_params)
   end
 
-  def show; end
-
   def update
     @custom_role.update!(permitted_params)
   end

enterprise/app/controllers/api/v1/accounts/sla_policies_controller.rb

@@ -6,12 +6,12 @@ class Api::V1::Accounts::SlaPoliciesController < Api::V1::Accounts::EnterpriseAc
     @sla_policies = Current.account.sla_policies
   end
 
+  def show; end
+
   def create
     @sla_policy = Current.account.sla_policies.create!(permitted_params)
   end
 
-  def show; end
-
   def update
     @sla_policy.update!(permitted_params)
   end