diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-03-17 00:29:58 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-03-17 00:29:58 +0000 |
| commit | d4daf4e23b2cab7f02f49aa9e5c3cf328ce37407 (patch) | |
| tree | 30669965c6062db7047c48f35ba4cbd44e61dcd8 /app/controllers/journals_controller.rb | |
| parent | 46208a6743b16f8f9030318a773abdc268899c33 (diff) | |
| download | redmine-d4daf4e23b2cab7f02f49aa9e5c3cf328ce37407.tar.gz redmine-d4daf4e23b2cab7f02f49aa9e5c3cf328ce37407.zip | |
Support frozen_string_literal in issue, journal, and query (#26561).
Patch by Pavel Rosický.
git-svn-id: http://svn.redmine.org/redmine/trunk@17980 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/journals_controller.rb')
| -rw-r--r-- | app/controllers/journals_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index ade2a5f6a..4e31faea9 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true # Redmine - project management software # Copyright (C) 2006-2017 Jean-Philippe Lang @@ -72,7 +72,7 @@ class JournalsController < ApplicationController end # Replaces pre blocks with [...] text = text.to_s.strip.gsub(%r{<pre>(.*?)</pre>}m, '[...]') - @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> " + @content = +"#{ll(Setting.default_language, :text_user_wrote, user)}\n> " @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" rescue ActiveRecord::RecordNotFound render_404 |