diff options
author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-04-27 09:15:54 +0800 |
---|---|---|
committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-04-27 09:15:54 +0800 |
commit | 8d8139862aee97d7fadc0563e7df9842f5bd46ac (patch) | |
tree | 453f638d2a6d6381c90acc0a055c7fe4602f3450 /app | |
parent | 3c3e14430ba14ae45ec758d263ba882ddf32f76f (diff) | |
download | gitlab-ce-8d8139862aee97d7fadc0563e7df9842f5bd46ac.tar.gz |
Rename `runner.belonging_to_group(project.id) -> runner.belonging_to_parent_group_of_project(project.id)`
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/projects/settings/ci_cd_controller.rb | 2 | ||||
-rw-r--r-- | app/models/ci/runner.rb | 4 | ||||
-rw-r--r-- | app/models/project.rb | 2 | ||||
-rw-r--r-- | app/services/ci/update_build_queue_service.rb | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb index 72a9b74767f..6ddbefacae0 100644 --- a/app/controllers/projects/settings/ci_cd_controller.rb +++ b/app/controllers/projects/settings/ci_cd_controller.rb @@ -79,7 +79,7 @@ module Projects @shared_runners_count = @shared_runners.count(:all) - @group_runners = ::Ci::Runner.belonging_to_group(@project.id) + @group_runners = ::Ci::Runner.belonging_to_parent_group_of_project(@project.id) end def define_secret_variables diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index d65395380d6..6904aca5e68 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -34,7 +34,7 @@ module Ci scope :belonging_to_any_project, -> { joins(:runner_projects) } - scope :belonging_to_group, -> (project_id) { + 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 @@ -42,7 +42,7 @@ module Ci } scope :owned_or_shared, -> (project_id) do - union = Gitlab::SQL::Union.new([belonging_to_project(project_id), belonging_to_group(project_id), shared]) + union = Gitlab::SQL::Union.new([belonging_to_project(project_id), belonging_to_parent_group_of_project(project_id), shared]) from("(#{union.to_sql}) ci_runners") end diff --git a/app/models/project.rb b/app/models/project.rb index 19024b4ea85..8e2145a4aa3 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1297,7 +1297,7 @@ class Project < ActiveRecord::Base end def group_runners - @group_runners ||= group_runners_enabled? ? Ci::Runner.belonging_to_group(self.id) : Ci::Runner.none + @group_runners ||= group_runners_enabled? ? Ci::Runner.belonging_to_parent_group_of_project(self.id) : Ci::Runner.none end def any_runners?(&block) diff --git a/app/services/ci/update_build_queue_service.rb b/app/services/ci/update_build_queue_service.rb index 05dbebc4f8d..c991f04ab30 100644 --- a/app/services/ci/update_build_queue_service.rb +++ b/app/services/ci/update_build_queue_service.rb @@ -4,7 +4,7 @@ module Ci tick_for(build, build.project.runners) if build.project.group_runners_enabled? - tick_for(build, Ci::Runner.belonging_to_group(build.project_id)) + tick_for(build, Ci::Runner.belonging_to_parent_group_of_project(build.project_id)) end if build.project.shared_runners_enabled? |