diff options
author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-03 11:59:38 +0300 |
---|---|---|
committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-03 12:23:47 +0300 |
commit | 49cbe576229b7e4003575e04006cc4132c3c0060 (patch) | |
tree | ffd27dde6e307a709e793d2720e92fd85c0bae77 | |
parent | d39b3d4b8d2d4c5ded46182a5353c68a8f5bb5cd (diff) |
Remove Runner#belonging_to_any_project since this is no longer needed
-rw-r--r-- | app/controllers/projects/settings/ci_cd_controller.rb | 1 | ||||
-rw-r--r-- | app/models/ci/runner.rb | 2 | ||||
-rw-r--r-- | spec/models/ci/runner_spec.rb | 15 |
3 files changed, 0 insertions, 18 deletions
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb index 6ddbefacae0..177c8a54099 100644 --- a/app/controllers/projects/settings/ci_cd_controller.rb +++ b/app/controllers/projects/settings/ci_cd_controller.rb @@ -72,7 +72,6 @@ module Projects .ci_authorized_runners .assignable_for(project) .ordered - .belonging_to_any_project .page(params[:page]).per(20) @shared_runners = ::Ci::Runner.shared.active diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index 0b47b71a267..2dfd038d5a8 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -32,8 +32,6 @@ module Ci joins(:runner_projects).where(ci_runner_projects: { project_id: project_id }) } - scope :belonging_to_any_project, -> { joins(:runner_projects) } - scope :belonging_to_parent_group_of_project, -> (project_id) { project_groups = ::Group.joins(:projects).where(projects: { id: project_id }) hierarchy_groups = Gitlab::GroupHierarchy.new(project_groups).base_and_ancestors diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb index 21d7d616a3c..cc4d4e5e4ae 100644 --- a/spec/models/ci/runner_spec.rb +++ b/spec/models/ci/runner_spec.rb @@ -137,21 +137,6 @@ describe Ci::Runner do end end - describe '.belonging_to_any_project' do - it 'returns the specific project runner' do - # project - project_project = create(:project) - project_runner = create(:ci_runner, :specific, projects: [project_project]) - - # group - group = create(:group) - create(:project, group: group) - create(:ci_runner, :specific, groups: [group]) - - expect(described_class.belonging_to_any_project).to eq [project_runner] - end - end - describe '.belonging_to_parent_group_of_project' do let(:project) { create(:project, group: group) } let(:group) { create(:group) } |