diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-22 03:09:40 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-22 03:09:40 +0000 |
commit | 448ff1fb8385c55a33535aa30699f739c0767db9 (patch) | |
tree | f03ae6c78debca3e06f594134d4cdaf1022dc50b /app/controllers/projects/blob_controller.rb | |
parent | 4ab94bde3a2668f456b61bcb8e16780d141035cd (diff) | |
download | gitlab-ce-448ff1fb8385c55a33535aa30699f739c0767db9.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/blob_controller.rb')
-rw-r--r-- | app/controllers/projects/blob_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 7f14522e61b..d969e7bf771 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -257,5 +257,3 @@ class Projects::BlobController < Projects::ApplicationController params.permit(:full, :since, :to, :bottom, :unfold, :offset, :indent) end end - -Projects::BlobController.prepend_if_ee('EE::Projects::BlobController') |