Merge branch 'rails5-fix-delete-blob' into 'master'
Rails5: fix delete blob See merge request gitlab-org/gitlab-ce!22456
This commit is contained in:
commit
fbb0f71237
2 changed files with 6 additions and 1 deletions
|
@ -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!
|
||||
|
||||
|
|
5
changelogs/unreleased/rails5-fix-delete-blob.yml
Normal file
5
changelogs/unreleased/rails5-fix-delete-blob.yml
Normal file
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: 'Rails5: fix delete blob'
|
||||
merge_request: 22456
|
||||
author: Jasper Maes
|
||||
type: other
|
Loading…
Reference in a new issue