diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 20:03:02 +0100 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 20:03:02 +0100 |
| commit | b1f8d8a1739ff48412c8205f0007a2af8399d097 (patch) | |
| tree | f7d35d158e7c9bdda6c282f916e02fe9a0d4df90 /lib/api/projects.rb | |
| parent | 52c3b8f31264230814d2ffa79d0987c1491676b3 (diff) | |
| parent | 5b08d59f07fc53c1e34819fac20352119d5343e6 (diff) | |
| download | gitlab-ce-b1f8d8a1739ff48412c8205f0007a2af8399d097.tar.gz | |
Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-ee-to-ce-backport
Diffstat (limited to 'lib/api/projects.rb')
| -rw-r--r-- | lib/api/projects.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index c459257158d..89dda88d3f5 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -361,6 +361,7 @@ module API authorize! :remove_fork_project, user_project if user_project.forked? + status 204 user_project.forked_project_link.destroy else not_modified! @@ -405,6 +406,7 @@ module API link = user_project.project_group_links.find_by(group_id: params[:group_id]) not_found!('Group Link') unless link + status 204 link.destroy end |