diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-10-22 07:01:10 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-10-22 07:01:10 +0000 |
| commit | fbb0f71237fca77746e84ba4cea837472a178f4d (patch) | |
| tree | 1524d30855c0c1476d37731ef222d934c459d8ba | |
| parent | c50b0491a615cb210fcb4461008be3fd978e1a62 (diff) | |
| parent | b9565fe75be9b03bad764139164cea2a2568589b (diff) | |
| download | gitlab-ce-fbb0f71237fca77746e84ba4cea837472a178f4d.tar.gz | |
Merge branch 'rails5-fix-delete-blob' into 'master'
Rails5: fix delete blob
See merge request gitlab-org/gitlab-ce!22456
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/rails5-fix-delete-blob.yml | 5 |
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 |