summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2021-10-03 05:17:18 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2021-10-03 05:17:18 +0000
commit09618a274bb1f7a1353ff1a8ad4d90fa3efef74c (patch)
tree92baf6ad80adc3299e17b4cdc88af1513a1eab91 /config
parent01a8167a138a7598a4716e9c04b9d77a50de7491 (diff)
downloadredmine-09618a274bb1f7a1353ff1a8ad4d90fa3efef74c.tar.gz
redmine-09618a274bb1f7a1353ff1a8ad4d90fa3efef74c.zip
Make hardbreaks behaviour configurable in config/configuration.yml (#32424).
git-svn-id: http://svn.redmine.org/redmine/trunk@21227 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
-rw-r--r--config/configuration.yml.example7
-rw-r--r--config/locales/en.yml2
2 files changed, 8 insertions, 1 deletions
diff --git a/config/configuration.yml.example b/config/configuration.yml.example
index 8e350228e..e1dbb19c2 100644
--- a/config/configuration.yml.example
+++ b/config/configuration.yml.example
@@ -224,6 +224,13 @@ default:
#avatar_server_url: https://www.gravatar.com # default
#avatar_server_url: https://seccdn.libravatar.org
+ # Configure CommonMark hardbreaks behaviour
+ #
+ # allowed values: true, false
+ # true: treats regular line break (\n) as hardbreaks
+ # false: switches to default common mark where two or more spaces are required
+ # common_mark_enable_hardbreaks: true
+
# specific configuration options for production environment
# that overrides the default ones
production:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 952138bf4..8fd84ff13 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1287,7 +1287,7 @@ en:
text_avatar_server_config_html: The current avatar server is <a href="%{url}">%{url}</a>. You can configure it in config/configuration.yml.
text_no_subject: no subject
text_allowed_queries_to_select: Public (to any users) queries only selectable
-
+ text_setting_config_change: You can configure the behaviour in config/configuration.yml. Please restart the application after editing it.
default_role_manager: Manager
default_role_developer: Developer