summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2017-02-24 10:24:14 +0100
committerRobert Schilling <rschilling@student.tugraz.at>2017-02-28 08:32:39 +0100
commit7d60876bc9c95323be185033f7f86b548fdf4728 (patch)
tree6c51b5024a98acf68d6b543f5f30e925f299a72a
parentc280acb00b3d4f3e071bfd36eecc8fffcebc2bb2 (diff)
downloadgitlab-ce-7d60876bc9c95323be185033f7f86b548fdf4728.tar.gz
Backport new behavior to CI API
-rw-r--r--lib/ci/api/builds.rb1
-rw-r--r--lib/ci/api/runners.rb2
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/ci/api/builds.rb b/lib/ci/api/builds.rb
index 0e17ac24d5a..b51e76d93f2 100644
--- a/lib/ci/api/builds.rb
+++ b/lib/ci/api/builds.rb
@@ -217,6 +217,7 @@ module Ci
build = Ci::Build.find_by_id(params[:id])
authenticate_build!(build)
+ status(200)
build.erase_artifacts!
end
end
diff --git a/lib/ci/api/runners.rb b/lib/ci/api/runners.rb
index 2a611a67eaf..c1fd959ef14 100644
--- a/lib/ci/api/runners.rb
+++ b/lib/ci/api/runners.rb
@@ -8,6 +8,8 @@ module Ci
end
delete "delete" do
authenticate_runner!
+
+ status(200)
Ci::Runner.find_by_token(params[:token]).destroy
end