Add latest changes from gitlab-org/gitlab@16-4-stable-ee

2 files changed, 2 insertions, 2 deletions

diff --git a/app/assets/javascripts/ci/pipeline_schedules/components/table/cells/pipeline_schedule_actions.vue b/app/assets/javascripts/ci/pipeline_schedules/components/table/cells/pipeline_schedule_actions.vue
index a56da06f5da..ed7c2bbeb73 100644
--- a/app/assets/javascripts/ci/pipeline_schedules/components/table/cells/pipeline_schedule_actions.vue
+++ b/app/assets/javascripts/ci/pipeline_schedules/components/table/cells/pipeline_schedule_actions.vue
@@ -34,7 +34,7 @@ export default {
       return this.schedule.userPermissions.playPipelineSchedule;
     },
     isCurrentUserOwner() {
-      return this.schedule.owner.username === this.currentUser.username;
+      return this.schedule.owner?.username === this.currentUser.username;
     },
     canTakeOwnership() {
       return !this.isCurrentUserOwner && this.schedule.userPermissions.adminPipelineSchedule;
diff --git a/app/graphql/types/ci/pipeline_schedule_type.rb b/app/graphql/types/ci/pipeline_schedule_type.rb
index e2e3bd8cfbd..cb4d9860fab 100644
--- a/app/graphql/types/ci/pipeline_schedule_type.rb
+++ b/app/graphql/types/ci/pipeline_schedule_type.rb
@@ -17,7 +17,7 @@ module Types
 
       field :description, GraphQL::Types::String, null: true, description: 'Description of the pipeline schedule.'
 
-      field :owner, ::Types::UserType, null: false, description: 'Owner of the pipeline schedule.'
+      field :owner, ::Types::UserType, null: true, description: 'Owner of the pipeline schedule.'
 
       field :active, GraphQL::Types::Boolean, null: false, description: 'Indicates if the pipeline schedule is active.'