summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-07-16 18:02:38 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-07-16 18:02:38 +0000
commita7e88dca7d63257c2daf8fde96272bdd41e47f4f (patch)
tree72dca3d23845325fd49a78b41dbdc98436c39f23 /app
parentce4efb98d63acbbdd69c4674d598eaae1c90efdb (diff)
downloadredmine-a7e88dca7d63257c2daf8fde96272bdd41e47f4f.tar.gz
redmine-a7e88dca7d63257c2daf8fde96272bdd41e47f4f.zip
Fixed that formatting of commit message is never applied (#26445).
git-svn-id: http://svn.redmine.org/redmine/trunk@16823 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/helpers/application_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3409bb7be..b8cb965c7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -651,7 +651,7 @@ module ApplicationHelper
if options[:formatting] == false
text = h(text)
else
- formatting = options[:formatting] || Setting.text_formatting
+ formatting = Setting.text_formatting
text = Redmine::WikiFormatting.to_html(formatting, text, :object => obj, :attribute => attr)
end