Commit c3f9d80a authored by Dylan Griffith's avatar Dylan Griffith

Rename User#ci_authorized_runners -> ci_owned_runners

parent 18821b15
...@@ -69,7 +69,7 @@ module Projects ...@@ -69,7 +69,7 @@ module Projects
@project_runners = @project.runners.ordered @project_runners = @project.runners.ordered
@assignable_runners = current_user @assignable_runners = current_user
.ci_authorized_runners .ci_owned_runners
.assignable_for(project) .assignable_for(project)
.ordered .ordered
.page(params[:page]).per(20) .page(params[:page]).per(20)
......
...@@ -999,8 +999,8 @@ class User < ActiveRecord::Base ...@@ -999,8 +999,8 @@ class User < ActiveRecord::Base
!solo_owned_groups.present? !solo_owned_groups.present?
end end
def ci_authorized_runners def ci_owned_runners
@ci_authorized_runners ||= begin @ci_owned_runners ||= begin
project_runner_ids = Ci::RunnerProject project_runner_ids = Ci::RunnerProject
.where(project: authorized_projects(Gitlab::Access::MASTER)) .where(project: authorized_projects(Gitlab::Access::MASTER))
.select(:runner_id) .select(:runner_id)
......
...@@ -3,14 +3,14 @@ module Ci ...@@ -3,14 +3,14 @@ module Ci
with_options scope: :subject, score: 0 with_options scope: :subject, score: 0
condition(:locked, scope: :subject) { @subject.locked? } condition(:locked, scope: :subject) { @subject.locked? }
condition(:authorized_runner) { @user.ci_authorized_runners.exists?(@subject.id) } condition(:owned_runner) { @user.ci_owned_runners.exists?(@subject.id) }
rule { anonymous }.prevent_all rule { anonymous }.prevent_all
rule { admin | authorized_runner }.enable :assign_runner rule { admin | owned_runner }.enable :assign_runner
rule { admin | authorized_runner }.enable :read_runner rule { admin | owned_runner }.enable :read_runner
rule { admin | authorized_runner }.enable :update_runner rule { admin | owned_runner }.enable :update_runner
rule { admin | authorized_runner }.enable :delete_runner rule { admin | owned_runner }.enable :delete_runner
rule { admin | authorized_runner }.enable :list_runner_jobs rule { admin | owned_runner }.enable :list_runner_jobs
rule { ~admin & locked }.prevent :assign_runner rule { ~admin & locked }.prevent :assign_runner
end end
end end
...@@ -14,7 +14,7 @@ module API ...@@ -14,7 +14,7 @@ module API
use :pagination use :pagination
end end
get do get do
runners = filter_runners(current_user.ci_authorized_runners, params[:scope], without: %w(specific shared)) runners = filter_runners(current_user.ci_owned_runners, params[:scope], without: %w(specific shared))
present paginate(runners), with: Entities::Runner present paginate(runners), with: Entities::Runner
end end
......
...@@ -58,7 +58,7 @@ module API ...@@ -58,7 +58,7 @@ module API
end end
def user_can_access_runner?(runner) def user_can_access_runner?(runner)
current_user.ci_authorized_runners.exists?(runner.id) current_user.ci_owned_runners.exists?(runner.id)
end end
end end
end end
......
...@@ -1786,7 +1786,7 @@ describe User do ...@@ -1786,7 +1786,7 @@ describe User do
end end
end end
describe '#ci_authorized_runners' do describe '#ci_owned_runners' do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:runner_1) { create(:ci_runner) } let(:runner_1) { create(:ci_runner) }
let(:runner_2) { create(:ci_runner) } let(:runner_2) { create(:ci_runner) }
...@@ -1796,7 +1796,7 @@ describe User do ...@@ -1796,7 +1796,7 @@ describe User do
let!(:group) { create(:group) } let!(:group) { create(:group) }
it 'does not load' do it 'does not load' do
expect(user.ci_authorized_runners).to be_empty expect(user.ci_owned_runners).to be_empty
end end
end end
...@@ -1805,7 +1805,7 @@ describe User do ...@@ -1805,7 +1805,7 @@ describe User do
let!(:project) { create(:project, namespace: namespace, runners: [runner_1]) } let!(:project) { create(:project, namespace: namespace, runners: [runner_1]) }
it 'loads' do it 'loads' do
expect(user.ci_authorized_runners).to contain_exactly(runner_1) expect(user.ci_owned_runners).to contain_exactly(runner_1)
end end
end end
...@@ -1818,7 +1818,7 @@ describe User do ...@@ -1818,7 +1818,7 @@ describe User do
end end
it 'loads' do it 'loads' do
expect(user.ci_authorized_runners).to contain_exactly(runner_2) expect(user.ci_owned_runners).to contain_exactly(runner_2)
end end
end end
...@@ -1833,7 +1833,7 @@ describe User do ...@@ -1833,7 +1833,7 @@ describe User do
end end
it 'loads' do it 'loads' do
expect(user.ci_authorized_runners).to contain_exactly(runner_1, runner_2) expect(user.ci_owned_runners).to contain_exactly(runner_1, runner_2)
end end
end end
...@@ -1844,7 +1844,7 @@ describe User do ...@@ -1844,7 +1844,7 @@ describe User do
end end
it 'loads' do it 'loads' do
expect(user.ci_authorized_runners).to contain_exactly(runner_1) expect(user.ci_owned_runners).to contain_exactly(runner_1)
end end
end end
...@@ -1854,7 +1854,7 @@ describe User do ...@@ -1854,7 +1854,7 @@ describe User do
end end
it 'does not load' do it 'does not load' do
expect(user.ci_authorized_runners).to be_empty expect(user.ci_owned_runners).to be_empty
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment