diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-05-12 15:25:56 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-05-12 15:25:56 +0000 |
| commit | 66824e09e23648923fea061e956c4c7a16730c75 (patch) | |
| tree | 25d4d0aa42608d23b80ceca4acddbd006b0e4456 /app/models/ci/runner.rb | |
| parent | 5298c3cc02865e8accff0fbacad36414ff38f883 (diff) | |
| parent | a2934f45317ed64beb948b8487199251a987c4a1 (diff) | |
| download | gitlab-ce-66824e09e23648923fea061e956c4c7a16730c75.tar.gz | |
Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master'
Reuse runners edit form in admin and project area
Reuse runners edit form in admin and project area.
See merge request !4094
Diffstat (limited to 'app/models/ci/runner.rb')
| -rw-r--r-- | app/models/ci/runner.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index 0cdb64d6c33..819064f99bb 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -3,7 +3,8 @@ module Ci extend Ci::Model LAST_CONTACT_TIME = 5.minutes.ago - AVAILABLE_SCOPES = ['specific', 'shared', 'active', 'paused', 'online'] + AVAILABLE_SCOPES = %w[specific shared active paused online] + FORM_EDITABLE = %i[description tag_list active] has_many :builds, class_name: 'Ci::Build' has_many :runner_projects, dependent: :destroy, class_name: 'Ci::RunnerProject' |