summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-03-19 02:42:58 +0000
committerGo MAEDA <maeda@farend.jp>2019-03-19 02:42:58 +0000
commit7d2f10ccac0e51a8eb337ed388ab8182df4c25e1 (patch)
tree825e7101aefda13d148372368c1b1b570a9dcd18
parentbf67729a28d8a7452bc1dc004d97664dc1ef6d80 (diff)
downloadredmine-7d2f10ccac0e51a8eb337ed388ab8182df4c25e1.tar.gz
redmine-7d2f10ccac0e51a8eb337ed388ab8182df4c25e1.zip
Fix FrozenError in RepositoriesController#diff (#31052, #26561).
Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/trunk@17990 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/repositories_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index e0af12a3c..ff950799b 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -239,7 +239,7 @@ class RepositoriesController < ApplicationController
if params[:format] == 'diff'
@diff = @repository.diff(@path, @rev, @rev_to)
(show_error_not_found; return) unless @diff
- filename = "changeset_r#{@rev}"
+ filename = +"changeset_r#{@rev}"
filename << "_r#{@rev_to}" if @rev_to
send_data @diff.join, :filename => "#{filename}.diff",
:type => 'text/x-patch',