summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-05-09 13:07:10 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-05-10 14:21:01 +0200
commit7d6d3421d64085c05c8b7a17dcf0b70fbdd478b5 (patch)
treef2a553d8dcf55320d5c24b36fa484b7718768bcd
parent732e98eee7da718d282903844649d02f935fd2be (diff)
downloadgitlab-ce-7d6d3421d64085c05c8b7a17dcf0b70fbdd478b5.tar.gz
Share form editable attributes mf runner via model
-rw-r--r--app/controllers/admin/runners_controller.rb2
-rw-r--r--app/controllers/projects/runners_controller.rb2
-rw-r--r--app/models/ci/runner.rb1
3 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/admin/runners_controller.rb b/app/controllers/admin/runners_controller.rb
index a701d49b844..8b8a7320072 100644
--- a/app/controllers/admin/runners_controller.rb
+++ b/app/controllers/admin/runners_controller.rb
@@ -58,6 +58,6 @@ class Admin::RunnersController < Admin::ApplicationController
end
def runner_params
- params.require(:runner).permit(:token, :description, :tag_list, :active)
+ params.require(:runner).permit(Ci::Runner::FORM_EDITABLE)
end
end
diff --git a/app/controllers/projects/runners_controller.rb b/app/controllers/projects/runners_controller.rb
index 0dd2d6a99be..3a9d67aff64 100644
--- a/app/controllers/projects/runners_controller.rb
+++ b/app/controllers/projects/runners_controller.rb
@@ -64,6 +64,6 @@ class Projects::RunnersController < Projects::ApplicationController
end
def runner_params
- params.require(:runner).permit(:description, :tag_list, :active)
+ params.require(:runner).permit(Ci::Runner::FORM_EDITABLE)
end
end
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index add59a08892..d27963e8ec5 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -23,6 +23,7 @@ module Ci
LAST_CONTACT_TIME = 5.minutes.ago
AVAILABLE_SCOPES = ['specific', 'shared', 'active', 'paused', 'online']
+ FORM_EDITABLE = [:description, :tag_list, :active]
has_many :builds, class_name: 'Ci::Build'
has_many :runner_projects, dependent: :destroy, class_name: 'Ci::RunnerProject'