diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 15:40:52 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 15:40:52 +0000 |
| commit | b5b8dc83cc1bb271877c79532ecfb555540672a7 (patch) | |
| tree | 190f6cd6991cbfbabbd670a7aac5ff36eb1a64bb /lib/api/runner.rb | |
| parent | deef09cd1f0dbe5cab5095ff02f19a5c3588cb91 (diff) | |
| parent | ff2f57da791890957fe97efd46f5c34f270a0c46 (diff) | |
| download | gitlab-ce-dispatcher-cycle-analytics.tar.gz | |
Merge branch 'master' into 'dispatcher-cycle-analytics'dispatcher-cycle-analytics
# 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! |