diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 15:09:24 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 15:09:24 +0000 |
commit | 8bcfcd53f3e3fe8df944eea6dab02556976fd4e3 (patch) | |
tree | 6f8cfaf7442b3ab092a107e249689e9049ee4738 /app/controllers/projects/commit_controller.rb | |
parent | 0549ffef0d4f862a7354847dd185725cc196eed0 (diff) | |
download | gitlab-ce-8bcfcd53f3e3fe8df944eea6dab02556976fd4e3.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
-rw-r--r-- | app/controllers/projects/commit_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 0c3ff07bc76..04186062344 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -49,7 +49,7 @@ class Projects::CommitController < Projects::ApplicationController end def diff_files - render json: { html: view_to_html_string('projects/commit/diff_files', diffs: @diffs, environment: @environment) } + render template: 'projects/commit/diff_files', layout: false, locals: { diffs: @diffs, environment: @environment } end # rubocop: disable CodeReuse/ActiveRecord |