Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/spec/lib/api/entities/basic_project_details_spec.rb b/spec/lib/api/entities/basic_project_details_spec.rb
index dc7c4fdce4e..8419eb0a932 100644
--- a/spec/lib/api/entities/basic_project_details_spec.rb
+++ b/spec/lib/api/entities/basic_project_details_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe API::Entities::BasicProjectDetails do
   let_it_be(:project) { create(:project) }
 
-  let(:current_user) { project.owner }
+  let(:current_user) { project.first_owner }
 
   subject(:output) { described_class.new(project, current_user: current_user).as_json }
 
diff --git a/spec/lib/api/helpers_spec.rb b/spec/lib/api/helpers_spec.rb
index 2277bd78e86..d81f39f3a55 100644
--- a/spec/lib/api/helpers_spec.rb
+++ b/spec/lib/api/helpers_spec.rb
@@ -160,7 +160,7 @@ RSpec.describe API::Helpers do
   describe '#find_project!' do
     let_it_be(:project) { create(:project) }
 
-    let(:user) { project.owner}
+    let(:user) { project.first_owner}
 
     before do
       allow(subject).to receive(:current_user).and_return(user)