summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Maes <jaspermaes.jm@gmail.com>2018-10-17 20:56:30 +0200
committerJasper Maes <jaspermaes.jm@gmail.com>2018-10-18 18:08:26 +0200
commitb9565fe75be9b03bad764139164cea2a2568589b (patch)
tree69712557860aaa02a226e82ccb9fd5e858b3d3b6
parent80351981d244911716ac1283c3c0c77b7a205899 (diff)
downloadgitlab-ce-b9565fe75be9b03bad764139164cea2a2568589b.tar.gz
Rails5: fix delete blob
-rw-r--r--app/controllers/projects/blob_controller.rb2
-rw-r--r--changelogs/unreleased/rails5-fix-delete-blob.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index fb2cfdedd9b..56a884b8a2a 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -9,7 +9,7 @@ class Projects::BlobController < Projects::ApplicationController
include ActionView::Helpers::SanitizeHelper
prepend_before_action :authenticate_user!, only: [:edit]
- before_action :set_request_format, only: [:edit, :show, :update]
+ before_action :set_request_format, only: [:edit, :show, :update, :destroy]
before_action :require_non_empty_project, except: [:new, :create]
before_action :authorize_download_code!
diff --git a/changelogs/unreleased/rails5-fix-delete-blob.yml b/changelogs/unreleased/rails5-fix-delete-blob.yml
new file mode 100644
index 00000000000..ee8304fbdf4
--- /dev/null
+++ b/changelogs/unreleased/rails5-fix-delete-blob.yml
@@ -0,0 +1,5 @@
+---
+title: 'Rails5: fix delete blob'
+merge_request: 22456
+author: Jasper Maes
+type: other