diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-11-14 10:54:30 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-11-14 10:54:30 +0000 |
| commit | 6b01821b0d7c7c624ab86936a7cadb82b3603630 (patch) | |
| tree | 22027af01434dddcf507a48a9e12d05b86ff4953 /lib/api | |
| parent | 6b9b516007c8dda88f33e9603a6880e3fc3ff103 (diff) | |
| parent | 8029c92e1c81e4c9ab55704bff82cca5ff893a03 (diff) | |
| download | gitlab-ce-6b01821b0d7c7c624ab86936a7cadb82b3603630.tar.gz | |
Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'
Do not allow jobs to be erased
Closes #31771
See merge request gitlab-org/gitlab-ce!15216
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/jobs.rb | 2 | ||||
| -rw-r--r-- | lib/api/v3/builds.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/jobs.rb b/lib/api/jobs.rb index 3c1c412ba42..a116ab3c9bd 100644 --- a/lib/api/jobs.rb +++ b/lib/api/jobs.rb @@ -136,7 +136,7 @@ module API authorize_update_builds! build = find_build!(params[:job_id]) - authorize!(:update_build, build) + authorize!(:erase_build, build) return forbidden!('Job is not erasable!') unless build.erasable? build.erase(erased_by: current_user) diff --git a/lib/api/v3/builds.rb b/lib/api/v3/builds.rb index f493fd7c7ec..fa0bef39602 100644 --- a/lib/api/v3/builds.rb +++ b/lib/api/v3/builds.rb @@ -169,7 +169,7 @@ module API authorize_update_builds! build = get_build!(params[:build_id]) - authorize!(:update_build, build) + authorize!(:erase_build, build) return forbidden!('Build is not erasable!') unless build.erasable? build.erase(erased_by: current_user) |