Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 0 deletions

diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index a7f3ff938c3..4e2cfda22cd 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -27,6 +27,11 @@ module Ci
       project_type: 3
     }
 
+    enum registration_type: {
+      registration_token: 0,
+      authenticated_user: 1
+    }
+
     enum executor_type: {
       unknown: 0,
       custom: 1,
@@ -77,6 +82,8 @@ module Ci
     has_one :last_build, -> { order('id DESC') }, class_name: 'Ci::Build'
     has_one :runner_version, primary_key: :version, foreign_key: :version, class_name: 'Ci::RunnerVersion'
 
+    belongs_to :creator, class_name: 'User', optional: true
+
     before_save :ensure_token
 
     scope :active, -> (value = true) { where(active: value) }