diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-10 15:09:10 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-10 15:09:10 +0000 |
commit | 9afe9ca576408a1145b6250d9493032fe65255ae (patch) | |
tree | e827cd826a15cd4d1fbe0a014d75d56785b8b75b /app/controllers/projects/blob_controller.rb | |
parent | 766b24b86ba1c5405d6a300f35062c33108941d4 (diff) | |
download | gitlab-ce-9afe9ca576408a1145b6250d9493032fe65255ae.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 99bb80619b1..e447ac874df 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -103,8 +103,6 @@ class Projects::BlobController < Projects::ApplicationController end def diff - apply_diff_view_cookie! - @form = Blobs::UnfoldPresenter.new(blob, diff_params) # keep only json rendering when |