Rename RunnerGroup -> RunnerNamespace

app/models/ci/runner.rb

@@ -14,8 +14,8 @@ module Ci
     has_many :builds
     has_many :runner_projects, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
     has_many :projects, through: :runner_projects
-    has_many :runner_groups
-    has_many :groups, through: :runner_groups
+    has_many :runner_namespaces
+    has_many :groups, through: :runner_namespaces
     has_one :last_build, ->() { order('id DESC') }, class_name: 'Ci::Build'
@@ -144,7 +144,7 @@ module Ci
     end
     def assigned_to_group?
-      runner_groups.any?
+      runner_namespaces.any?
     end
     def assigned_to_project?

app/models/ci/runner_group.rb

-module Ci
-  class RunnerGroup < ActiveRecord::Base
-    extend Gitlab::Ci::Model
-
-    belongs_to :runner
-    belongs_to :group, class_name: '::Group'
-  end
-end

app/models/ci/runner_namespace.rb

+module Ci
+  class RunnerNamespace < ActiveRecord::Base
+    extend Gitlab::Ci::Model
+
+    belongs_to :runner
+    belongs_to :namespace, class_name: '::Namespace'
+    belongs_to :group, class_name: '::Group', foreign_key: :namespace_id
+  end
+end

app/models/group.rb

@@ -29,8 +29,6 @@ class Group < Namespace
   has_many :labels, class_name: 'GroupLabel'
   has_many :variables, class_name: 'Ci::GroupVariable'
   has_many :custom_attributes, class_name: 'GroupCustomAttribute'
-  has_many :runner_groups, class_name: 'Ci::RunnerGroup'
-  has_many :runners, through: :runner_groups, source: :runner, class_name: 'Ci::Runner'
   has_many :uploads, as: :model, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent

app/models/namespace.rb

@@ -21,6 +21,9 @@ class Namespace < ActiveRecord::Base
   has_many :projects, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
   has_many :project_statistics
+  has_many :runner_namespaces, class_name: 'Ci::RunnerNamespace'
+  has_many :runners, through: :runner_namespaces, source: :runner, class_name: 'Ci::Runner'
+
   # This should _not_ be `inverse_of: :namespace`, because that would also set
   # `user.namespace` when this user creates a group with themselves as `owner`.
   belongs_to :owner, class_name: "User"

db/migrate/20170301101006_add_ci_runner_groups.rb → db/migrate/20170301101006_add_ci_runner_namespaces.rb

-class AddCiRunnerGroups < ActiveRecord::Migration
+class AddCiRunnerNamespaces < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
   DOWNTIME = false
@@ -6,14 +6,14 @@ class AddCiRunnerGroups < ActiveRecord::Migration
   disable_ddl_transaction!
   def change
-    create_table :ci_runner_groups do |t|
+    create_table :ci_runner_namespaces do |t|
       t.integer :runner_id
-      t.integer :group_id
-      t.index [:runner_id, :group_id], unique: true
-      t.index :group_id
+      t.integer :namespace_id
+      t.index [:runner_id, :namespace_id], unique: true
+      t.index :namespace_id
       t.foreign_key :ci_runners, column: :runner_id, on_delete: :cascade
-      t.foreign_key :namespaces, column: :group_id, on_delete: :cascade
+      t.foreign_key :namespaces, column: :namespace_id, on_delete: :cascade
     end
   end
 end

db/schema.rb

@@ -443,13 +443,13 @@ ActiveRecord::Schema.define(version: 20180430143705) do
   add_index "ci_pipelines", ["status"], name: "index_ci_pipelines_on_status", using: :btree
   add_index "ci_pipelines", ["user_id"], name: "index_ci_pipelines_on_user_id", using: :btree
-  create_table "ci_runner_groups", force: :cascade do |t|
+  create_table "ci_runner_namespaces", force: :cascade do |t|
     t.integer "runner_id"
-    t.integer "group_id"
+    t.integer "namespace_id"
   end
-  add_index "ci_runner_groups", ["group_id"], name: "index_ci_runner_groups_on_group_id", using: :btree
-  add_index "ci_runner_groups", ["runner_id", "group_id"], name: "index_ci_runner_groups_on_runner_id_and_group_id", unique: true, using: :btree
+  add_index "ci_runner_namespaces", ["namespace_id"], name: "index_ci_runner_namespaces_on_namespace_id", using: :btree
+  add_index "ci_runner_namespaces", ["runner_id", "namespace_id"], name: "index_ci_runner_namespaces_on_runner_id_and_namespace_id", unique: true, using: :btree
   create_table "ci_runner_projects", force: :cascade do |t|
     t.integer "runner_id", null: false
@@ -2096,8 +2096,8 @@ ActiveRecord::Schema.define(version: 20180430143705) do
   add_foreign_key "ci_pipelines", "ci_pipeline_schedules", column: "pipeline_schedule_id", name: "fk_3d34ab2e06", on_delete: :nullify
   add_foreign_key "ci_pipelines", "ci_pipelines", column: "auto_canceled_by_id", name: "fk_262d4c2d19", on_delete: :nullify
   add_foreign_key "ci_pipelines", "projects", name: "fk_86635dbd80", on_delete: :cascade
-  add_foreign_key "ci_runner_groups", "ci_runners", column: "runner_id", on_delete: :cascade
-  add_foreign_key "ci_runner_groups", "namespaces", column: "group_id", on_delete: :cascade
+  add_foreign_key "ci_runner_namespaces", "ci_runners", column: "runner_id", on_delete: :cascade
+  add_foreign_key "ci_runner_namespaces", "namespaces", column: "group_id", on_delete: :cascade
   add_foreign_key "ci_runner_projects", "projects", name: "fk_4478a6f1e4", on_delete: :cascade
   add_foreign_key "ci_stages", "ci_pipelines", column: "pipeline_id", name: "fk_fb57e6cc56", on_delete: :cascade
   add_foreign_key "ci_stages", "projects", name: "fk_2360681d1d", on_delete: :cascade