summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-02-16 13:06:52 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-02-18 07:45:55 +0100
commit2b223d884201e9e2d1d6586da5d98c5082659034 (patch)
tree66cf68b73eee812538637e9f20d5e57774698060
parent443e14224132960cebb03f9f5fe141b2cb85f328 (diff)
downloadgitlab-ce-ci/remove-builds.tar.gz
Record user that erased a build through APIci/remove-builds
-rw-r--r--lib/api/builds.rb2
-rw-r--r--spec/requests/api/builds_spec.rb5
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/api/builds.rb b/lib/api/builds.rb
index b265fa148ba..c058128ae54 100644
--- a/lib/api/builds.rb
+++ b/lib/api/builds.rb
@@ -138,7 +138,7 @@ module API
return not_found!(build) unless build
return forbidden!('Build is not erasable!') unless build.erasable?
- build.erase
+ build.erase(erased_by: current_user)
present build, with: Entities::Build,
user_can_download_artifacts: can?(current_user, :download_build_artifacts, user_project)
end
diff --git a/spec/requests/api/builds_spec.rb b/spec/requests/api/builds_spec.rb
index c634bb84b77..adbae5dcad8 100644
--- a/spec/requests/api/builds_spec.rb
+++ b/spec/requests/api/builds_spec.rb
@@ -184,6 +184,11 @@ describe API::API, api: true do
expect(build.artifacts_file.exists?).to be_falsy
expect(build.artifacts_metadata.exists?).to be_falsy
end
+
+ it 'should update build' do
+ expect(build.reload.erased_at).to be_truthy
+ expect(build.reload.erased_by).to eq user
+ end
end
context 'build is not erasable' do