diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 18:40:06 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 18:40:06 +0000 |
| commit | 9353c5c780c7af6d6ed3d6c501b155f82debc99c (patch) | |
| tree | 55d87571798f5ff10ee1431a296f1115251f67e9 /lib/api/runner.rb | |
| parent | c287c01821c4db4830dbdd5263907f08c2ed4cc4 (diff) | |
| parent | e2638c3ff2714e5efd4bc54e64555fc564c84af1 (diff) | |
| download | gitlab-ce-pipelines_show_refactor.tar.gz | |
Merge branch 'master' into 'pipelines_show_refactor'pipelines_show_refactor
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'lib/api/runner.rb')
| -rw-r--r-- | lib/api/runner.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/runner.rb b/lib/api/runner.rb index 5469cba69a6..91cdc564002 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -16,7 +16,8 @@ module API optional :tag_list, type: Array[String], desc: %q(List of Runner's tags) end post '/' do - attributes = attributes_for_keys [:description, :locked, :run_untagged, :tag_list] + attributes = attributes_for_keys([:description, :locked, :run_untagged, :tag_list]) + .merge(get_runner_details_from_request) runner = if runner_registration_token_valid? @@ -30,7 +31,6 @@ module API return forbidden! unless runner if runner.id - runner.update(get_runner_version_from_params) present runner, with: Entities::RunnerRegistrationDetails else not_found! |