diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-08-30 21:13:19 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-08-30 21:13:19 +0800 |
| commit | 86149a82168e9aead7ce6841c69705662f8a6e54 (patch) | |
| tree | 3578fcf52de007f8f9d845339bc4f2c86e7e8b46 /lib/api/snippets.rb | |
| parent | 9954dafda58a0d5d856fdbbef01633e674638aa1 (diff) | |
| parent | f431543654f6150bb39b191e8ad9acc0ee651de4 (diff) | |
| download | gitlab-ce-86149a82168e9aead7ce6841c69705662f8a6e54.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 36807-gc-unwanted-refs-after-import
* upstream/master: (225 commits)
Add changelog entry
Backports EE 2756 logic to CE.
Make rubocop happy
Make profile settings dropdown consistent
Add filter by my reaction
Update spec initialization with it being a shared component
Update identicon path and selector
Renamed to `identicon` and make shared component
Merge branch 'master-i18n' into 'master'
Fix broken Frontend JS guide
Replace 'project/star.feature' spinach test with an rspec analog
Adds position fixed to right sidebar
Fixes the margin of the top buttons of the pipeline page
Remove commented out code
Better align fallback image emojis
Decrease Metrics/CyclomaticComplexity threshold to 15
Add changelog
Respect the default visibility level when creating a group
Further break with_repo_branch_commit into parts
Make sure inspect doesn't generate crazy string
...
Diffstat (limited to 'lib/api/snippets.rb')
| -rw-r--r-- | lib/api/snippets.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/api/snippets.rb b/lib/api/snippets.rb index 35ece56c65c..00eb7c60f16 100644 --- a/lib/api/snippets.rb +++ b/lib/api/snippets.rb @@ -123,8 +123,7 @@ module API authorize! :destroy_personal_snippet, snippet - status 204 - snippet.destroy + destroy_conditionally!(snippet) end desc 'Get a raw snippet' do |