diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-30 16:49:22 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-30 16:49:22 +0100 |
| commit | 4d2d744ae9a2d4c3bb0f00805c27704b79e00d72 (patch) | |
| tree | 839b1c3ab4c09c80f7d643fe69dae8a83c4e4eb4 /lib/api/runner.rb | |
| parent | 25a3b7fab905d09f6f064108f457a4e20c8915ff (diff) | |
| parent | f7c8434c7100c3c87eb2a75cd5a128e520d8c110 (diff) | |
| download | gitlab-ce-enable-new-navigaton-by-default.tar.gz | |
Merge branch 'master' into enable-new-navigaton-by-defaultenable-new-navigaton-by-default
Diffstat (limited to 'lib/api/runner.rb')
| -rw-r--r-- | lib/api/runner.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/api/runner.rb b/lib/api/runner.rb index 88fc62d33df..11999354594 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -45,8 +45,10 @@ module API end delete '/' do authenticate_runner! - status 204 - Ci::Runner.find_by_token(params[:token]).destroy + + runner = Ci::Runner.find_by_token(params[:token]) + + destroy_conditionally!(runner) end desc 'Validates authentication credentials' do @@ -78,7 +80,7 @@ module API no_content! unless current_runner.active? update_runner_info - if current_runner.is_runner_queue_value_latest?(params[:last_update]) + if current_runner.runner_queue_value_latest?(params[:last_update]) header 'X-GitLab-Last-Update', params[:last_update] Gitlab::Metrics.add_event(:build_not_found_cached) return no_content! |